From cf148cae4937f807347e56d94b2dc96c9f258c59 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Jul 2021 15:04:48 +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 | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 8a73c42..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
@@ -5,6 +5,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -77,10 +78,18 @@
* 登陆时间
*/
String loginTime;
+ @ApiModelProperty("推广人数")
+ Integer extensionNum;
+ @ApiModelProperty("订单数")
+ Integer allOrderNum;
+ @ApiModelProperty("环保金")
+ BigDecimal money;
+ @ApiModelProperty("积分数")
+ BigDecimal collectScore;
@ApiModelProperty("1:已删除 0：未删除")
String delFlag;
-
+// @ApiModelProperty("1:已删除 0：未删除")
Integer orderStatus3;
Integer orderStatus5;
//入库重量
--
Gitblit v1.9.1