From 0cd3a666af34e28eaf50ed1392b5d219a9d2b1cf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 24 七月 2024 09:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 server/service/src/main/java/com/doumee/dao/business/model/Users.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Users.java b/server/service/src/main/java/com/doumee/dao/business/model/Users.java
index a32d9a6..5725539 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Users.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Users.java
@@ -90,7 +90,7 @@
     @ExcelColumn(name="寰俊openid")
     private String openid;
 
-    @ApiModelProperty(value = "璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤", example = "1")
+    @ApiModelProperty(value = "璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤锛�-1鍒犻櫎", example = "1")
     @ExcelColumn(name="璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤")
     private String status;
 
@@ -200,6 +200,13 @@
     @ApiModelProperty(value = "闂ㄥ簵鍦板潃")
     @TableField(exist = false)
     private String shopAddress;
+    @ApiModelProperty(value = "闂ㄥ簵鍩庡競")
+    @TableField(exist = false)
+    private String shopCity;
+
+    @ApiModelProperty(value = "C绔敤鎴锋墜鏈哄彿",notes = "鐢ㄤ簬鏌ヨ鐢ㄦ埛缁戝畾鐨勫璐�",hidden = true)
+    @TableField(exist = false)
+    private String memberPhone;
 
     @ApiModelProperty(value = "浼佷笟浜岀淮鐮佸浘鐗囧畬鏁村湴鍧�")
     @TableField(exist = false)

--
Gitblit v1.9.3