From c384e04f81caf681647c602d5896cc10b289582e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 14:59:16 +0800
Subject: [PATCH] 经销商管理

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Member.java |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 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..8640e34 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
@@ -32,7 +32,7 @@
     private Integer creator;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-    @ExcelColumn(name="鍒涘缓鏃堕棿",width = 10,index = 8,dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @ExcelColumn(name="鍒涘缓鏃堕棿",width = 10,index = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -69,7 +69,7 @@
     private String phone;
 
     @ApiModelProperty(value = "韬唤璇佸彿")
-   // @ExcelColumn(name="韬唤璇佸彿")
+    @ExcelColumn(name="韬唤璇佸彿" ,width = 10,index = 5)
     private String idcard;
 
     @ApiModelProperty(value = "韬唤璇佹闈㈢収")
@@ -81,15 +81,19 @@
     private String idcardImgBack;
 
     @ApiModelProperty(value = "绉垎浣欓", example = "1")
-    @ExcelColumn(name="绉垎浣欓",width = 10,index = 5)
+    @ExcelColumn(name="绉垎浣欓",width = 10,index = 6)
     private BigDecimal integral;
 
     @ApiModelProperty(value = "绉垎绱", example = "1")
-    @ExcelColumn(name="绉垎绱鑾峰緱",width = 10,index = 6)
+    @ExcelColumn(name="绉垎绱鑾峰緱",width = 10,index = 7)
     private BigDecimal totalIntegral;
+    @ApiModelProperty(value = "绉垎鎵i櫎绱", example = "1")
+    @ExcelColumn(name="绉垎绱鎵i櫎",width = 10,index =8)
+    @TableField(exist = false)
+    private BigDecimal totalReduceIntegral;
 
-    @ApiModelProperty(value = "鐘舵��0姝e父 1寮傚父", example = "1")
-    @ExcelColumn(name="鐘舵��",width = 10,index =9,valueMapping = "0=鍚敤;1=绂佺敤")
+    @ApiModelProperty(value = "鐘舵��0姝e父 1寮傚父 2娉ㄩ攢", example = "1")
+    @ExcelColumn(name="鐘舵��",width = 10,index =11,valueMapping = "0=鍚敤;1=绂佺敤;2=宸叉敞閿�;")
     private Integer status;
 
     @ApiModelProperty(value = "鎬у埆 0鐢� 1濂� 2鏈煡", example = "1")
@@ -151,6 +155,9 @@
     @ApiModelProperty(value = "缁戝畾鍟嗛摵涓婚敭 shop:id 鍒嗛攢浜�")
     private Integer bindShopId;
 
+    @ApiModelProperty(value = "缁戝畾鏃堕棿")
+    private Date bindShopDate;
+
     @ApiModelProperty(value = "鏂囦欢鍦板潃鍏ㄨ矾寰�")
     @TableField(exist = false)
     private String imgFullUrl;
@@ -160,7 +167,7 @@
     private String cityName;
     @ApiModelProperty(value = "缁忛攢鍟嗗悕绉�")
     @TableField(exist = false)
-    @ExcelColumn(name = "鍏宠仈缁忛攢鍟�",width = 10,index = 7)
+    @ExcelColumn(name = "鍏宠仈缁忛攢鍟�",width = 10,index = 9)
     private String shopName;
     @ApiModelProperty(value = "寮�濮嬫椂闂� ")
     @TableField(exist = false)
@@ -170,4 +177,7 @@
     @TableField(exist = false)
     private Date endtime;
 
+
+
+
 }

--
Gitblit v1.9.3