From 6e1f28f042cf597b85c0a02b031b9db9b7e55358 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 30 七月 2024 09:11:02 +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 |    5 ++++-
 1 files changed, 4 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 d18349a..c59e902 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;
 
@@ -203,6 +203,9 @@
     @ApiModelProperty(value = "闂ㄥ簵鍩庡競")
     @TableField(exist = false)
     private String shopCity;
+    @ApiModelProperty(value = "鏄惁鍙鐞嗛棬搴�")
+    @TableField(exist = false)
+    private Boolean manageShop;
 
     @ApiModelProperty(value = "C绔敤鎴锋墜鏈哄彿",notes = "鐢ㄤ簬鏌ヨ鐢ㄦ埛缁戝畾鐨勫璐�",hidden = true)
     @TableField(exist = false)

--
Gitblit v1.9.3