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/ComMajorPopulationDO.java |  153 ++++++++++++++++++++++----------------------------
 1 files changed, 68 insertions(+), 85 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java
index 676151b..05502cd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java
@@ -1,13 +1,13 @@
 package com.panzhihua.service_community.model.dos;
 
-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 com.baomidou.mybatisplus.annotation.*;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
 
 /**
  * @auther txb
@@ -23,156 +23,139 @@
     private static final long serialVersionUID = 1L;
 
     /**
-    * 主键id
-    */
-    @TableId(type = IdType.INPUT)
+     * 主键id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
-    * 人口id
-    */
+     * 人口id
+     */
     private Long populationId;
 
     /**
-    * 街道id
-    */
+     * 街道id
+     */
     private Long streetId;
 
     /**
-    * 社区id
-    */
+     * 社区id
+     */
     private Long communityId;
 
     /**
-    * 名字
-    */
+     * 名字
+     */
     private String name;
 
     /**
-    * 身份证号码
-    */
+     * 身份证号码
+     */
     @EncryptDecryptField
     private String cardNo;
 
     /**
-    * 经济状况
-    */
+     * 经济状况
+     */
     private String economicCondition;
 
     /**
-    * 人员类型
-    */
+     * 人员类型
+     */
     private String personType;
 
     /**
-    * 家庭情况
-    */
+     * 家庭情况
+     */
     private String familySituation;
 
     /**
-    * 监护人姓名
-    */
+     * 监护人姓名
+     */
     private String custodyPerson;
 
     /**
-    * 与监护人关系
-    */
-    private Integer custodyRelation;
+     * 与监护人关系
+     */
+    private String custodyRelation;
 
     /**
-    * 监护人公民身份号码
-    */
+     * 监护人公民身份号码
+     */
     private String custodyCardNo;
 
     /**
-    * 监护人联系方式
-    */
+     * 监护人联系方式
+     */
     private String custodyPersonPhone;
 
     /**
-    * 监护人居住详址
-    */
+     * 监护人居住详址
+     */
     private String custodyAddress;
 
     /**
-    * 帮扶人姓名
-    */
+     * 帮扶人姓名
+     */
     private String helpPerson;
 
     /**
-    * 帮扶人联系方式
-    */
+     * 帮扶人联系方式
+     */
     private String helpPersonPhone;
 
     /**
-    * 帮扶手段
-    */
+     * 帮扶手段
+     */
     private String helpMethod;
 
     /**
-    * 帮扶情况
-    */
+     * 帮扶情况
+     */
     private String helpSituation;
 
     /**
-    * 是否违法犯罪(1.是 0.否)
-    */
+     * 是否违法犯罪(1.是 0.否)
+     */
     private Integer isCrime;
 
     /**
-    * 违法犯罪情况
-    */
+     * 违法犯罪情况
+     */
     private String crimeSutiation;
 
     /**
-    * 创建时间
-    */
+     * 创建时间
+     */
     @TableField(fill = FieldFill.INSERT)
     private Date createAt;
 
     /**
-    * 创建用户
-    */
+     * 创建用户
+     */
     private Long createBy;
 
     /**
-    * 修改时间
-    */
+     * 修改时间
+     */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateAt;
 
     /**
-    * 修改用户
-    */
+     * 修改用户
+     */
     private Long updateBy;
 
-@Override
-public String toString() {
-        return "ComMajorPopulationDO{" +
-                "id=" + id +
-                ", populationId=" + populationId +
-                ", streetId=" + streetId +
-                ", communityId=" + communityId +
-                ", name=" + name +
-                ", cardNo=" + cardNo +
-                ", economicCondition=" + economicCondition +
-                ", personType=" + personType +
-                ", familySituation=" + familySituation +
-                ", custodyPerson=" + custodyPerson +
-                ", custodyRelation=" + custodyRelation +
-                ", custodyCardNo=" + custodyCardNo +
-                ", custodyPersonPhone=" + custodyPersonPhone +
-                ", custodyAddress=" + custodyAddress +
-                ", helpPerson=" + helpPerson +
-                ", helpPersonPhone=" + helpPersonPhone +
-                ", helpMethod=" + helpMethod +
-                ", helpSituation=" + helpSituation +
-                ", isCrime=" + isCrime +
-                ", crimeSutiation=" + crimeSutiation +
-                ", createAt=" + createAt +
-                ", createBy=" + createBy +
-                ", updateAt=" + updateAt +
-                ", updateBy=" + updateBy +
-        "}";
-        }
-        }
\ No newline at end of file
+    @Override
+    public String toString() {
+        return "ComMajorPopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId=" + streetId
+            + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", economicCondition="
+            + economicCondition + ", personType=" + personType + ", familySituation=" + familySituation
+            + ", custodyPerson=" + custodyPerson + ", custodyRelation=" + custodyRelation + ", custodyCardNo="
+            + custodyCardNo + ", custodyPersonPhone=" + custodyPersonPhone + ", custodyAddress=" + custodyAddress
+            + ", helpPerson=" + helpPerson + ", helpPersonPhone=" + helpPersonPhone + ", helpMethod=" + helpMethod
+            + ", helpSituation=" + helpSituation + ", isCrime=" + isCrime + ", crimeSutiation=" + crimeSutiation
+            + ", createAt=" + createAt + ", createBy=" + createBy + ", updateAt=" + updateAt + ", updateBy=" + updateBy
+            + "}";
+    }
+}
\ No newline at end of file

--
Gitblit v1.7.1