From 461a737f9b4c935213698feddc12b535a588b832 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 25 Aug 2021 15:03:39 +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 | 4 +++-
1 files changed, 3 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 71e7cba..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
@@ -86,10 +86,12 @@
BigDecimal money;
@ApiModelProperty("积分数")
BigDecimal collectScore;
+ @ApiModelProperty("推广人电话号码")
+ String tgrPhone;
@ApiModelProperty("1:已删除 0：未删除")
String delFlag;
- @ApiModelProperty("1:已删除 0：未删除")
+// @ApiModelProperty("1:已删除 0：未删除")
Integer orderStatus3;
Integer orderStatus5;
//入库重量
--
Gitblit v1.9.1