From 00a8e2f76d02cfc17ca9ff156aa97f85bae5897d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 09 Aug 2021 16:50:55 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java | 16 ++++++++--------
1 files changed, 8 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..2f5f475 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,14 @@
* 登陆时间
*/
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("1:已删除 0：未删除")
String delFlag;
--
Gitblit v1.9.1