From d0e27ecff97fff5fabed2696c9813c8e17ac6322 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 23 Nov 2023 17:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java | 3
src/main/java/org/springblade/modules/property/service/IPropertyCapitalApplyService.java | 3
src/main/java/org/springblade/modules/district/mapper/DistrictMapper.java | 5
src/main/java/org/springblade/modules/property/controller/PropertyDistrictUserController.java | 4
src/main/java/org/springblade/modules/property/service/IPropertyCompanyDistrictService.java | 3
src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java | 58 +++++++++++
src/main/java/org/springblade/modules/property/entity/PropertyDistrictUserEntity.java | 18 +++
src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java | 4
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 58 +++++++++++
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java | 3
src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml | 13 ++
src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java | 4
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 3
src/main/java/org/springblade/modules/property/service/impl/PropertyDistrictUserServiceImpl.java | 3
src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java | 4
src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java | 58 +++++++++++
src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java | 3
src/main/java/org/springblade/modules/property/service/IPropertyDistrictUserService.java | 3
18 files changed, 220 insertions(+), 30 deletions(-)
diff --git a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.java b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.java
index 5ffcd26..f4a6b65 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.java
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.district.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.vo.DistrictVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -32,12 +33,10 @@
/**
* 自定义分页
- *
* @param page
* @param district
* @return
*/
- List<DistrictVO> selectDistrictPage(IPage page, DistrictVO district);
-
+ List<DistrictVO> selectDistrictPage(IPage page,@Param("district") DistrictVO district);
}
diff --git a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
index 91b1c83..ed612c5 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -19,9 +19,16 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
-
- <select id="selectDistrictPage" resultMap="districtResultMap">
- select * from jczz_district where is_deleted = 0
+ <!--自定义分页-->
+ <select id="selectDistrictPage" resultType="org.springblade.modules.district.vo.DistrictVO">
+ select * from jczz_district
+ where is_deleted = 0
+ <if test="district.name !=null and district.name !=''">
+ and name like concat('%',#{district.name},'%')
+ </if>
+ <if test="district.communityCode !=null and district.communityCode !=''">
+ and community_code = #{district.communityCode}
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java
index a2f6bd4..064dbc5 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCapitalApplyController.java
@@ -46,7 +46,7 @@
@AllArgsConstructor
@RequestMapping("blade-propertyCapitalApply/propertyCapitalApply")
@Api(value = "物业维修资金申请表", tags = "物业维修资金申请表接口")
-public class PropertyCapitalApplyController extends BladeController {
+public class PropertyCapitalApplyController{
private final IPropertyCapitalApplyService propertyCapitalApplyService;
@@ -119,7 +119,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(propertyCapitalApplyService.deleteLogic(Func.toLongList(ids)));
+ return R.status(propertyCapitalApplyService.removeByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
index e9a28d6..fc90837 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
@@ -46,7 +46,7 @@
@AllArgsConstructor
@RequestMapping("blade-propertyCompany/propertyCompany")
@Api(value = "物业公司", tags = "物业公司接口")
-public class PropertyCompanyController extends BladeController {
+public class PropertyCompanyController {
private final IPropertyCompanyService propertyCompanyService;
@@ -119,7 +119,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(propertyCompanyService.deleteLogic(Func.toLongList(ids)));
+ return R.status(propertyCompanyService.removeByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java
index 8b785b8..53b204e 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyDistrictController.java
@@ -46,7 +46,7 @@
@AllArgsConstructor
@RequestMapping("blade-propertyCompanyDistrict/propertyCompanyDistrict")
@Api(value = "物业派驻小区表", tags = "物业派驻小区表接口")
-public class PropertyCompanyDistrictController extends BladeController {
+public class PropertyCompanyDistrictController {
private final IPropertyCompanyDistrictService propertyCompanyDistrictService;
@@ -119,7 +119,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(propertyCompanyDistrictService.deleteLogic(Func.toLongList(ids)));
+ return R.status(propertyCompanyDistrictService.removeByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyDistrictUserController.java b/src/main/java/org/springblade/modules/property/controller/PropertyDistrictUserController.java
index e9e3d4b..f26843e 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyDistrictUserController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyDistrictUserController.java
@@ -46,7 +46,7 @@
@AllArgsConstructor
@RequestMapping("blade-propertyDistrictUser/propertyDistrictUser")
@Api(value = "物业公司人员派驻小区关联表", tags = "物业公司人员派驻小区关联表接口")
-public class PropertyDistrictUserController extends BladeController {
+public class PropertyDistrictUserController {
private final IPropertyDistrictUserService propertyDistrictUserService;
@@ -119,7 +119,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(propertyDistrictUserService.deleteLogic(Func.toLongList(ids)));
+ return R.status(propertyDistrictUserService.removeByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
index d1cd38c..f03796e 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -16,15 +16,25 @@
*/
package org.springblade.modules.property.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Info;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 物业维修资金申请表 实体类
@@ -35,9 +45,16 @@
@Data
@TableName("jczz_property_capital_apply")
@ApiModel(value = "PropertyCapitalApply对象", description = "物业维修资金申请表")
-@EqualsAndHashCode(callSuper = true)
-public class PropertyCapitalApplyEntity extends TenantEntity {
+public class PropertyCapitalApplyEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
/**
* 物业公司id
*/
@@ -114,4 +131,41 @@
@ApiModelProperty(value = "施工方案附件urls")
private String constructionSchemeUrls;
+ /**
+ * 创建人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("创建人")
+ private String createUser;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("更新人")
+ private String updateUser;
+
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("更新时间")
+ private Date updateTime;
+
+ /**
+ * 是否删除
+ */
+ @TableLogic
+ @ApiModelProperty("是否已删除 0:否 1:是")
+ private Integer isDeleted;
+
}
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
index db05842..d93ffa2 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyDistrictEntity.java
@@ -16,13 +16,22 @@
*/
package org.springblade.modules.property.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 物业派驻小区表 实体类
@@ -33,8 +42,16 @@
@Data
@TableName("jczz_property_company_district")
@ApiModel(value = "PropertyCompanyDistrict对象", description = "物业派驻小区表")
-@EqualsAndHashCode(callSuper = true)
-public class PropertyCompanyDistrictEntity extends TenantEntity {
+public class PropertyCompanyDistrictEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
/**
* 物业公司id
@@ -92,4 +109,41 @@
@ApiModelProperty(value = "简介")
private String remark;
+ /**
+ * 创建人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("创建人")
+ private String createUser;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("更新人")
+ private String updateUser;
+
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("更新时间")
+ private Date updateTime;
+
+ /**
+ * 是否删除
+ */
+ @TableLogic
+ @ApiModelProperty("是否已删除 0:否 1:是")
+ private Integer isDeleted;
+
}
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java
index 369ddca..516839c 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java
@@ -16,13 +16,22 @@
*/
package org.springblade.modules.property.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 物业公司 实体类
@@ -33,8 +42,16 @@
@Data
@TableName("jczz_property_company")
@ApiModel(value = "PropertyCompany对象", description = "物业公司")
-@EqualsAndHashCode(callSuper = true)
-public class PropertyCompanyEntity extends TenantEntity {
+public class PropertyCompanyEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
/**
* 物业公司名称
@@ -72,4 +89,41 @@
@ApiModelProperty(value = "简介")
private String remark;
+ /**
+ * 创建人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("创建人")
+ private String createUser;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("更新人")
+ private String updateUser;
+
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("更新时间")
+ private Date updateTime;
+
+ /**
+ * 是否删除
+ */
+ @TableLogic
+ @ApiModelProperty("是否已删除 0:否 1:是")
+ private Integer isDeleted;
+
}
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyDistrictUserEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyDistrictUserEntity.java
index 01752ac..7a2bdf0 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyDistrictUserEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyDistrictUserEntity.java
@@ -16,12 +16,18 @@
*/
package org.springblade.modules.property.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serializable;
/**
* 物业公司人员派驻小区关联表 实体类
@@ -32,8 +38,16 @@
@Data
@TableName("jczz_property_district_user")
@ApiModel(value = "PropertyDistrictUser对象", description = "物业公司人员派驻小区关联表")
-@EqualsAndHashCode(callSuper = true)
-public class PropertyDistrictUserEntity extends TenantEntity {
+public class PropertyDistrictUserEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
/**
* 物业公司id
diff --git a/src/main/java/org/springblade/modules/property/service/IPropertyCapitalApplyService.java b/src/main/java/org/springblade/modules/property/service/IPropertyCapitalApplyService.java
index c718d46..cdd8535 100644
--- a/src/main/java/org/springblade/modules/property/service/IPropertyCapitalApplyService.java
+++ b/src/main/java/org/springblade/modules/property/service/IPropertyCapitalApplyService.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.property.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
import org.springblade.modules.property.vo.PropertyCapitalApplyVO;
import org.springblade.core.mp.base.BaseService;
@@ -27,7 +28,7 @@
* @author BladeX
* @since 2023-11-23
*/
-public interface IPropertyCapitalApplyService extends BaseService<PropertyCapitalApplyEntity> {
+public interface IPropertyCapitalApplyService extends IService<PropertyCapitalApplyEntity> {
/**
* 自定义分页
diff --git a/src/main/java/org/springblade/modules/property/service/IPropertyCompanyDistrictService.java b/src/main/java/org/springblade/modules/property/service/IPropertyCompanyDistrictService.java
index 22bdeb4..dce44dc 100644
--- a/src/main/java/org/springblade/modules/property/service/IPropertyCompanyDistrictService.java
+++ b/src/main/java/org/springblade/modules/property/service/IPropertyCompanyDistrictService.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.property.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.vo.PropertyCompanyDistrictVO;
import org.springblade.core.mp.base.BaseService;
@@ -27,7 +28,7 @@
* @author BladeX
* @since 2023-11-23
*/
-public interface IPropertyCompanyDistrictService extends BaseService<PropertyCompanyDistrictEntity> {
+public interface IPropertyCompanyDistrictService extends IService<PropertyCompanyDistrictEntity> {
/**
* 自定义分页
diff --git a/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java b/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java
index bd2b48c..b15a7a7 100644
--- a/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java
+++ b/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.property.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.vo.PropertyCompanyVO;
import org.springblade.core.mp.base.BaseService;
@@ -27,7 +28,7 @@
* @author BladeX
* @since 2023-11-23
*/
-public interface IPropertyCompanyService extends BaseService<PropertyCompanyEntity> {
+public interface IPropertyCompanyService extends IService<PropertyCompanyEntity> {
/**
* 自定义分页
diff --git a/src/main/java/org/springblade/modules/property/service/IPropertyDistrictUserService.java b/src/main/java/org/springblade/modules/property/service/IPropertyDistrictUserService.java
index 8079365..23bfb10 100644
--- a/src/main/java/org/springblade/modules/property/service/IPropertyDistrictUserService.java
+++ b/src/main/java/org/springblade/modules/property/service/IPropertyDistrictUserService.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.property.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.property.entity.PropertyDistrictUserEntity;
import org.springblade.modules.property.vo.PropertyDistrictUserVO;
import org.springblade.core.mp.base.BaseService;
@@ -27,7 +28,7 @@
* @author BladeX
* @since 2023-11-23
*/
-public interface IPropertyDistrictUserService extends BaseService<PropertyDistrictUserEntity> {
+public interface IPropertyDistrictUserService extends IService<PropertyDistrictUserEntity> {
/**
* 自定义分页
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
index 0e45c85..79065b7 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.property.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
import org.springblade.modules.property.vo.PropertyCapitalApplyVO;
import org.springblade.modules.property.mapper.PropertyCapitalApplyMapper;
@@ -31,7 +32,7 @@
* @since 2023-11-23
*/
@Service
-public class PropertyCapitalApplyServiceImpl extends BaseServiceImpl<PropertyCapitalApplyMapper, PropertyCapitalApplyEntity> implements IPropertyCapitalApplyService {
+public class PropertyCapitalApplyServiceImpl extends ServiceImpl<PropertyCapitalApplyMapper, PropertyCapitalApplyEntity> implements IPropertyCapitalApplyService {
@Override
public IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply) {
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
index 5a320a1..9f39bed 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.property.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.vo.PropertyCompanyDistrictVO;
import org.springblade.modules.property.mapper.PropertyCompanyDistrictMapper;
@@ -31,7 +32,7 @@
* @since 2023-11-23
*/
@Service
-public class PropertyCompanyDistrictServiceImpl extends BaseServiceImpl<PropertyCompanyDistrictMapper, PropertyCompanyDistrictEntity> implements IPropertyCompanyDistrictService {
+public class PropertyCompanyDistrictServiceImpl extends ServiceImpl<PropertyCompanyDistrictMapper, PropertyCompanyDistrictEntity> implements IPropertyCompanyDistrictService {
@Override
public IPage<PropertyCompanyDistrictVO> selectPropertyCompanyDistrictPage(IPage<PropertyCompanyDistrictVO> page, PropertyCompanyDistrictVO propertyCompanyDistrict) {
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
index a4c3f9e..1da4a90 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.property.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.vo.PropertyCompanyVO;
import org.springblade.modules.property.mapper.PropertyCompanyMapper;
@@ -31,7 +32,7 @@
* @since 2023-11-23
*/
@Service
-public class PropertyCompanyServiceImpl extends BaseServiceImpl<PropertyCompanyMapper, PropertyCompanyEntity> implements IPropertyCompanyService {
+public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMapper, PropertyCompanyEntity> implements IPropertyCompanyService {
@Override
public IPage<PropertyCompanyVO> selectPropertyCompanyPage(IPage<PropertyCompanyVO> page, PropertyCompanyVO propertyCompany) {
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyDistrictUserServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyDistrictUserServiceImpl.java
index ff7aa12..aae0d5a 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyDistrictUserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyDistrictUserServiceImpl.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.property.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.property.entity.PropertyDistrictUserEntity;
import org.springblade.modules.property.vo.PropertyDistrictUserVO;
import org.springblade.modules.property.mapper.PropertyDistrictUserMapper;
@@ -31,7 +32,7 @@
* @since 2023-11-23
*/
@Service
-public class PropertyDistrictUserServiceImpl extends BaseServiceImpl<PropertyDistrictUserMapper, PropertyDistrictUserEntity> implements IPropertyDistrictUserService {
+public class PropertyDistrictUserServiceImpl extends ServiceImpl<PropertyDistrictUserMapper, PropertyDistrictUserEntity> implements IPropertyDistrictUserService {
@Override
public IPage<PropertyDistrictUserVO> selectPropertyDistrictUserPage(IPage<PropertyDistrictUserVO> page, PropertyDistrictUserVO propertyDistrictUser) {
--
Gitblit v1.9.3