feat(property): 添加权限组字段

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ResidentPerson.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
 
@@ -13,7 +12,7 @@ import java.io.Serial;
  * 入驻员工对象 resident_person
  *
  * @author mocheng
- * @date 2025-06-19
+ * @since 2025-06-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -89,6 +88,11 @@ public class ResidentPerson extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 权限组
+     */
+    private Long authGroupId;
+
     /**
      * 创建人id
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ResidentUnit.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
 
@@ -13,7 +12,7 @@ import java.io.Serial;
  * 入驻单位对象 resident_unit
  *
  * @author mocheng
- * @date 2025-06-19
+ * @since 2025-06-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -79,6 +78,11 @@ public class ResidentUnit extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 权限组
+     */
+    private Long authGroupId;
+
     /**
      * 创建人id
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ResidentPersonBo.java

@@ -9,13 +9,12 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 入驻员工业务对象 resident_person
  *
  * @author mocheng
- * @date 2025-06-19
+ * @since 2025-06-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -86,7 +85,13 @@ public class ResidentPersonBo extends BaseEntity {
      * 状态
      */
 //    @NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long state=1l;
+    private Long state=1L;
+
+    /**
+     * 权限组
+     */
+    @NotNull(message = "权限组不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long authGroupId;
 
     /**
      * 备注

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ResidentUnitBo.java

@@ -9,13 +9,12 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 入驻单位业务对象 resident_unit
  *
  * @author mocheng
- * @date 2025-06-19
+ * @since 2025-06-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -80,7 +79,13 @@ public class ResidentUnitBo extends BaseEntity {
      * 员工人数
      */
 //    @NotNull(message = "员工人数不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long number=0l;
+    private Long number=0L;
+
+    /**
+     * 权限组
+     */
+    @NotNull(message = "权限组不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long authGroupId;
 
     /**
      * 备注

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ResidentPersonVo.java

@@ -1,18 +1,14 @@
 package org.dromara.property.domain.vo;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.property.domain.ResidentPerson;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 
 
@@ -20,7 +16,7 @@ import java.util.Date;
  * 入驻员工视图对象 resident_person
  *
  * @author mocheng
- * @date 2025-06-19
+ * @since 2025-06-19
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -108,5 +104,11 @@ public class ResidentPersonVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 权限组id
+     */
+    @ExcelProperty(value = "权限组id")
+    private Long authGroupId;
+
 
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ResidentUnitVo.java

@@ -1,18 +1,14 @@
 package org.dromara.property.domain.vo;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.property.domain.ResidentUnit;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 
 
@@ -20,7 +16,7 @@ import java.util.Date;
  * 入驻单位视图对象 resident_unit
  *
  * @author mocheng
- * @date 2025-06-19
+ * @since 2025-06-19
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -107,5 +103,10 @@ public class ResidentUnitVo implements Serializable {
     @ExcelProperty(value = "创建时间")
     private Date createTime;
 
+    /**
+     * 权限组id
+     */
+    @ExcelProperty(value = "权限组id")
+    private Long authGroupId;
 
 }