From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java |   44 +++++++++++++++++++++++++++-----------------
 1 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
index c70b862..04bab5f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
@@ -1,12 +1,13 @@
 package com.panzhihua.service_community.model.dos;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.*;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
-import lombok.Data;
 
-import java.io.Serializable;
-import java.util.Date;
+import lombok.Data;
 
 @Data
 @TableName(value = "com_mng_population")
@@ -17,7 +18,7 @@
     /**
      * 自增 id
      */
-    @TableId(type = IdType.INPUT)
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 街道id
@@ -42,7 +43,7 @@
     /**
      * 年龄
      */
-//    private Integer age;
+    // private Integer age;
 
     /**
      * 证件类型
@@ -102,7 +103,7 @@
     @EncryptDecryptField
     private String phone;
     /**
-     * 外地or本地(1.本地  2.外地)
+     * 外地or本地(1.本地 2.外地)
      */
     private Integer outOrLocal;
     /**
@@ -111,7 +112,7 @@
     private String censusRegister;
 
     /**
-     * 人员类型(1、户籍人员2、留守人员3、外地人员4、境外人员)
+     * 人员类型(1、户籍人口2、留守人员3、外地人员4、境外人员5、流动人口6、常住人口7、暂住人口)
      */
     private String personType;
 
@@ -154,7 +155,6 @@
      * 婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)
      */
     private Integer marriage;
-
 
     /**
      * 健康状况
@@ -219,7 +219,7 @@
     /**
      * 标签集合(多个标签以,隔开)
      */
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField(fill = FieldFill.UPDATE,updateStrategy = FieldStrategy.IGNORED)
     private String label;
 
     /**
@@ -251,11 +251,21 @@
      */
     @TableField(fill = FieldFill.INSERT)
     private Date createAt;
+
+    /**
+     * 创建用戶
+     */
+    private Long createBy;
     /**
      * 修改时间
      */
     @TableField(fill = FieldFill.UPDATE)
     private Date updateAt;
+
+    /**
+     * 修改用戶
+     */
+    private Long updateBy;
 
     /**
      * 小区名字
@@ -266,9 +276,9 @@
     /**
      * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
      */
-//    private Integer relation;
-//
-//    private String relationStr;
+    // private Integer relation;
+    //
+    // private String relationStr;
 
     /**
      * 是否居住地
@@ -288,7 +298,7 @@
     /**
      * 性别(1.男 2.女 3.未知)
      */
-    public interface sex{
+    public interface sex {
         int nan = 1;
         int nv = 2;
         int no = 3;
@@ -297,7 +307,7 @@
     /**
      * 是否租住
      */
-    public interface isOk{
+    public interface isOk {
         int yes = 1;
         int no = 0;
     }
@@ -305,7 +315,7 @@
     /**
      * 政治面貌
      */
-    public interface politicalOutlook{
+    public interface politicalOutlook {
         int dang = 1;
         int tuan = 3;
         int wu = 12;
@@ -314,9 +324,9 @@
     }
 
     /**
-     * 外地or本地(1.本地  2.外地)
+     * 外地or本地(1.本地 2.外地)
      */
-    public interface outOrLocal{
+    public interface outOrLocal {
         int bd = 1;
         int wd = 2;
     }

--
Gitblit v1.7.1