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/guns/modular/system/model/IntroduceUser.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceUser.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceUser.java
index b4266b7..9846b54 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceUser.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceUser.java
@@ -16,14 +16,22 @@
@NoArgsConstructor
public class IntroduceUser {
private Integer id;
- // 分享用户id
- private Integer shareUsers;
- private String shareUsersName;
- private String shareUsersphone;
- private String userName;
+
+ // 新用户id
+ private Integer shareUserId;
+ // 新用户名称
+ private String shareUserName;
+ // 新用户电话
+ private String shareUserPhone;
+
+ // 推荐人id
private Integer userId;
+ // 推荐人电话
private String userPhone;
- private Integer introduceRewards;
+ // 推荐人名称
+ private String userName;
+ // 活动id
+ private Integer activityId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private Date registerTime;
+ private Date insertTime;
}
--
Gitblit v1.7.1