From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/entity/TAppUser.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/TAppUser.java b/cloud-server-account/src/main/java/com/dsh/account/entity/TAppUser.java
index 50ed45c..c0b9123 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/entity/TAppUser.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/TAppUser.java
@@ -23,7 +23,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_app_user")
-public class TAppUser{
+public class TAppUser {
private static final long serialVersionUID = 1L;
@@ -56,7 +56,7 @@
* 生日
*/
@TableField("birthday")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
/**
* 性别（1=男，2=女）
@@ -161,5 +161,16 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
-
+ /**
+ * 添加类型 type = 1 平台 type=2 运营商 type=3门店
+ */
+ @TableField("insertType")
+ private Integer insertType;
+ /**
+ * 添加人id平台管理员id 运营商id
+ */
+ @TableField("addUserId")
+ private Integer addUserId;
+ @TableField(exist = false)
+ private Integer age;
}
--
Gitblit v1.7.1