From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/TAppUser.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/TAppUser.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/TAppUser.java
index d55f7a7..eb2edf1 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/TAppUser.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/TAppUser.java
@@ -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,14 @@
@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;
}
--
Gitblit v1.7.1