From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComKeyPopulationDO.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComKeyPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComKeyPopulationDO.java
index cae7cf8..ea216be 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComKeyPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComKeyPopulationDO.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,66 +23,66 @@
private static final long serialVersionUID = 1L;
/**
- * 主键id
- */
+ * 主键id
+ */
@TableId(type = IdType.INPUT)
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 phone;
/**
- * 备注
- */
+ * 备注
+ */
private String remark;
/**
- * 创建时间
- */
+ * 创建时间
+ */
@TableField(fill = FieldFill.INSERT)
private Date createAt;
/**
- * 创建用户
- */
+ * 创建用户
+ */
private Long createBy;
/**
- * 修改时间
- */
+ * 修改时间
+ */
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateAt;
/**
- * 修改用户
- */
+ * 修改用户
+ */
private Long updateBy;
}
\ No newline at end of file
--
Gitblit v1.7.1