From 0a206f3acb9af0ec9db650861d34a256cda1c960 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Member.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Member.java
index 4a5c6f2..2b6a577 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -88,7 +88,7 @@
@ExcelColumn(name="绉垎绱鑾峰緱",width = 10,index = 6)
private BigDecimal totalIntegral;
- @ApiModelProperty(value = "鐘舵��0姝ｅ父 1寮傚父", example = "1")
+ @ApiModelProperty(value = "鐘舵��0姝ｅ父 1寮傚父 2娉ㄩ攢", example = "1")
@ExcelColumn(name="鐘舵��",width = 10,index =9,valueMapping = "0=鍚敤;1=绂佺敤")
private Integer status;
@@ -151,6 +151,9 @@
@ApiModelProperty(value = "缁戝畾鍟嗛摵涓婚敭 shop:id 鍒嗛攢浜�")
private Integer bindShopId;
+ @ApiModelProperty(value = "缁戝畾鏃堕棿")
+ private Date bindShopDate;
+
@ApiModelProperty(value = "鏂囦欢鍦板潃鍏ㄨ矾寰�")
@TableField(exist = false)
private String imgFullUrl;
@@ -170,4 +173,7 @@
@TableField(exist = false)
private Date endtime;
+
+
+
}
--
Gitblit v1.9.3