Merge remote-tracking branch 'origin/master'

boman-api/boman-domain/src/main/java/com/boman/domain/Czrk.java

@@ -1,6 +1,7 @@
 package com.boman.domain;
 
 import java.util.Date;
+import java.util.List;
 
 import com.boman.domain.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -24,7 +25,7 @@ import lombok.experimental.SuperBuilder;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
-public class Czrk {
+public class Czrk extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     public static final String IS_DEL_N = "N";
@@ -103,6 +104,9 @@ public class Czrk {
     @Excel(name = "与户主关系")
     private String yhzgx;
 
+    /** 是否认领 “是”，“否”,判断标准：该人员是否有所属镇 */
+    private String isRl;
+
     /**
      * 当前人所在的最后一级的部门id
      */
@@ -213,6 +217,11 @@ public class Czrk {
     private String deleteReason;
     private String remark;
 
+    private List<CzrkJzdz> czrkJzdzList;
+
+    /** 部门id集合 */
+    private List<Long> deptIdList;
+
     private java.sql.Timestamp createTime;
     private java.sql.Timestamp updateTime;
     private String createBy;