From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Member.java | 75 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 34 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 a9e72fa..aafedd4 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
@@ -23,134 +23,136 @@
public class Member {
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
+ // @ExcelColumn(name="涓婚敭")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ // @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
-
+ @ExcelColumn(name="鍒涘缓鏃堕棿",width = 10,index = 8,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ // @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
+ // @ExcelColumn(name="鏇存柊鏃堕棿")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ // @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ // @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鏄电О")
- @ExcelColumn(name="鏄电О")
+ @ExcelColumn(name="鏄电О",width = 10,index = 2)
private String nickname;
@ApiModelProperty(value = "澶村儚")
- @ExcelColumn(name="澶村儚")
+ // @ExcelColumn(name="澶村儚")
private String imgurl;
@ApiModelProperty(value = "鐪熷疄濮撳悕")
- @ExcelColumn(name="鐪熷疄濮撳悕")
+ @ExcelColumn(name="瀹㈡埛濮撳悕",width = 10,index = 3)
private String name;
@ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�")
+ @ExcelColumn(name="鎺堟潈鎵嬫満鍙�",width = 10,index = 4)
private String phone;
@ApiModelProperty(value = "韬唤璇佸彿")
- @ExcelColumn(name="韬唤璇佸彿")
+ // @ExcelColumn(name="韬唤璇佸彿")
private String idcard;
@ApiModelProperty(value = "韬唤璇佹闈㈢収")
- @ExcelColumn(name="韬唤璇佹闈㈢収")
+ // @ExcelColumn(name="韬唤璇佹闈㈢収")
private String idcardImg;
@ApiModelProperty(value = "韬唤璇佸弽闈㈢収")
- @ExcelColumn(name="韬唤璇佸弽闈㈢収")
+ // @ExcelColumn(name="韬唤璇佸弽闈㈢収")
private String idcardImgBack;
@ApiModelProperty(value = "绉垎浣欓", example = "1")
- @ExcelColumn(name="绉垎浣欓")
+ @ExcelColumn(name="绉垎浣欓",width = 10,index = 5)
private BigDecimal integral;
@ApiModelProperty(value = "绉垎绱", example = "1")
- @ExcelColumn(name="绉垎绱")
+ @ExcelColumn(name="绉垎绱鑾峰緱",width = 10,index = 6)
private BigDecimal totalIntegral;
@ApiModelProperty(value = "鐘舵��0姝ｅ父 1寮傚父", example = "1")
- @ExcelColumn(name="鐘舵��0姝ｅ父 1寮傚父")
+ @ExcelColumn(name="鐘舵��",width = 10,index =9,valueMapping = "0=鍚敤;1=绂佺敤")
private Integer status;
@ApiModelProperty(value = "鎬у埆 0鐢� 1濂� 2鏈煡", example = "1")
- @ExcelColumn(name="鎬у埆 0鐢� 1濂� 2鏈煡")
+ // @ExcelColumn(name="鎬у埆 0鐢� 1濂� 2鏈煡")
private Integer sex;
@ApiModelProperty(value = "瀹氫綅缁忓害", example = "1")
- @ExcelColumn(name="瀹氫綅缁忓害")
+ // @ExcelColumn(name="瀹氫綅缁忓害")
private BigDecimal longitude;
@ApiModelProperty(value = "瀹氫綅缁村害", example = "1")
- @ExcelColumn(name="瀹氫綅缁村害")
+ // @ExcelColumn(name="瀹氫綅缁村害")
private BigDecimal latitude;
@ApiModelProperty(value = "褰撳墠鎵�鍦ㄥ煄甯傜紪鐮侊紙鍏宠仈areas琛級", example = "1")
- @ExcelColumn(name="褰撳墠鎵�鍦ㄥ煄甯傜紪鐮侊紙鍏宠仈areas琛級")
+ // @ExcelColumn(name="褰撳墠鎵�鍦ㄥ煄甯傜紪鐮侊紙鍏宠仈areas琛級")
private Integer cityId;
@ApiModelProperty(value = "鍦板潃")
- @ExcelColumn(name="鍦板潃")
+ // @ExcelColumn(name="鍦板潃")
private String addr;
@ApiModelProperty(value = "绫诲瀷 0鏅�氱敤鎴�", example = "1")
- @ExcelColumn(name="绫诲瀷 0鏅�氱敤鎴�")
+ // @ExcelColumn(name="绫诲瀷 0鏅�氱敤鎴�")
private Integer type;
@ApiModelProperty(value = "涓�鍙ヨ瘽浠嬬粛")
- @ExcelColumn(name="涓�鍙ヨ瘽浠嬬粛")
+ // @ExcelColumn(name="涓�鍙ヨ瘽浠嬬粛")
private String info;
@ApiModelProperty(value = "鏁版嵁鏉ユ簮 0灏忕▼搴忔敞鍐� 1鍚庡彴褰曞叆", example = "1")
- @ExcelColumn(name="鏁版嵁鏉ユ簮 0灏忕▼搴忔敞鍐� 1鍚庡彴褰曞叆")
+ // @ExcelColumn(name="鏁版嵁鏉ユ簮 0灏忕▼搴忔敞鍐� 1鍚庡彴褰曞叆")
private Integer origin;
@ApiModelProperty(value = "閭�璇蜂汉缂栫爜锛堝叧鑱攎ember琛級", example = "1")
- @ExcelColumn(name="閭�璇蜂汉缂栫爜锛堝叧鑱攎ember琛級")
+ // @ExcelColumn(name="閭�璇蜂汉缂栫爜锛堝叧鑱攎ember琛級")
private Integer recId;
@ApiModelProperty(value = "閭�璇峰鍔卞挅璞�", example = "1")
- @ExcelColumn(name="閭�璇峰鍔卞挅璞�")
+ // @ExcelColumn(name="閭�璇峰鍔卞挅璞�")
private BigDecimal recIntegral;
@ApiModelProperty(value = "娉ㄥ唽濂栧姳鍜栬眴", example = "1")
- @ExcelColumn(name="娉ㄥ唽濂栧姳鍜栬眴")
+ // @ExcelColumn(name="娉ㄥ唽濂栧姳鍜栬眴")
private BigDecimal registerIntegral;
@ApiModelProperty(value = "寰俊openId")
- @ExcelColumn(name="寰俊openId")
+ @ExcelColumn(name="寰俊openId",width = 10,index = 1)
private String openId;
@ApiModelProperty(value = "鐢熸棩")
- @ExcelColumn(name="birthday")
+ // @ExcelColumn(name="birthday")
private Date birthday;
@ApiModelProperty(value = "寰俊鍒嗕韩鐮�")
- @ExcelColumn(name="sharingCode")
+ // @ExcelColumn(name="sharingCode")
private String sharingCode;
@ApiModelProperty(value = "缁戝畾鍟嗛摵涓婚敭 shop:id 鍒嗛攢浜�")
private Integer bindShopId;
+
+ @ApiModelProperty(value = "缁戝畾鏃堕棿")
+ private Date bindShopDate;
@ApiModelProperty(value = "鏂囦欢鍦板潃鍏ㄨ矾寰�")
@TableField(exist = false)
@@ -159,8 +161,10 @@
@ApiModelProperty(value = "鐢ㄦ埛鎵�鍦ㄥ煄甯�")
@TableField(exist = false)
private String cityName;
-
-
+ @ApiModelProperty(value = "缁忛攢鍟嗗悕绉�")
+ @TableField(exist = false)
+ @ExcelColumn(name = "鍏宠仈缁忛攢鍟�",width = 10,index = 7)
+ private String shopName;
@ApiModelProperty(value = "寮�濮嬫椂闂� ")
@TableField(exist = false)
private Date starttime;
@@ -169,4 +173,7 @@
@TableField(exist = false)
private Date endtime;
+
+
+
}
--
Gitblit v1.9.3