From ef4ad171c46f615a5b719bac70c468b561bc08ac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 08 Dec 2021 11:22:43 +0800
Subject: [PATCH] Merge branch 'score-shop' into xc-prd
---
gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java b/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
index 99ca15e..0d5088a 100644
--- a/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
+++ b/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
@@ -78,14 +78,16 @@
* 登陆时间
*/
String loginTime;
-// @ApiModelProperty("推广人数")
-// Integer extensionNum;
-// @ApiModelProperty("订单数")
-// Integer allOrderNum;
-// @ApiModelProperty("环保金")
-// BigDecimal money;
-// @ApiModelProperty("积分数")
-// BigDecimal collectScore;
+ @ApiModelProperty("推广人数")
+ Integer extensionNum;
+ @ApiModelProperty("订单数")
+ Integer allOrderNum;
+ @ApiModelProperty("环保金")
+ BigDecimal money;
+ @ApiModelProperty("积分数")
+ BigDecimal collectScore;
+ @ApiModelProperty("推广人电话号码")
+ String tgrPhone;
@ApiModelProperty("1:已删除 0：未删除")
String delFlag;
--
Gitblit v1.9.1