Merge remote-tracking branch 'origin/master'

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

@@ -27,6 +27,9 @@ import lombok.experimental.SuperBuilder;
 public class Czrk {
     private static final long serialVersionUID = 1L;
 
+    public static final String IS_DEL_N = "N";
+    public static final String IS_DEL_Y = "Y";
+
     /**
      * 主键
      */
@@ -100,6 +103,13 @@ public class Czrk {
     @Excel(name = "与户主关系")
     private String yhzgx;
 
+    /**
+     * 当前人所在的最后一级的部门id
+     */
+    @Excel(name = "当前人所在的最后一级的部门id")
+    private Long deptId;
+
+
     /**
      * 工作单位
      */
@@ -191,10 +201,10 @@ public class Czrk {
     private String status;
 
     /**
-     * 是否删除
+     * 是否删除 默认为 "N"
      */
     @Excel(name = "是否删除")
-    private String isDel;
+    private String isDel = "N";
 
     /**
      * 删除原因