From 367281413e2120cb9192a2ec9ecbc49c4331b6af Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 27 八月 2025 18:16:32 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 57 +++++++++++++++++++++++----------------------------------
1 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Member.java b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
index 474874c..03ff91f 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
@@ -26,139 +26,112 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="娉ㄥ唽鏃堕棿",index = 8,width = 16, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "澶村儚")
- @ExcelColumn(name="澶村儚")
private String coverImage;
@ApiModelProperty(value = "openid")
- @ExcelColumn(name="openid")
+ @ExcelColumn(name="openid",index = 1,width = 20)
private String openid;
@ApiModelProperty(value = "鏄电О")
- @ExcelColumn(name="鏄电О")
+ @ExcelColumn(name="鏄电О",index = 3,width = 10)
private String nickName;
@ApiModelProperty(value = "鑱旂郴鐢佃瘽")
- @ExcelColumn(name="鑱旂郴鐢佃瘽")
+ @ExcelColumn(name="鎵嬫満鍙�",index = 2,width = 10)
private String telephone;
@ApiModelProperty(value = "濮撳悕")
- @ExcelColumn(name="濮撳悕")
+ @ExcelColumn(name="鐪熷疄濮撳悕",index = 4,width = 10)
private String name;
@ApiModelProperty(value = "鐢ㄥ伐韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
- @ExcelColumn(name="鐢ㄥ伐韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�")
private Integer workerIdentity;
@ApiModelProperty(value = "璐ц繍韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
- @ExcelColumn(name="璐ц繍韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�")
private Integer driverIdentity;
- @ApiModelProperty(value = "渚涢寰堢矇:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
- @ExcelColumn(name="渚涢寰堢矇:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�")
+ @ApiModelProperty(value = "渚涢韬唤:0=鏈敵璇凤紱1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
private Integer chefIdentity;
@ApiModelProperty(value = "褰撳墠浣欓(鍗曚綅:鍒�)", example = "1")
- @ExcelColumn(name="褰撳墠浣欓(鍗曚綅:鍒�)")
private Long amount;
@ApiModelProperty(value = "鍘嗗彶鎬婚噾棰�(鍗曚綅:鍒�)", example = "1")
- @ExcelColumn(name="鍘嗗彶鎬婚噾棰�(鍗曚綅:鍒�)")
private Long totalAmount;
@ApiModelProperty(value = "鐘舵��", example = "1")
- @ExcelColumn(name="鐘舵��")
private Integer status;
@ApiModelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
- @ExcelColumn(name="鏈�鍚庣櫥褰曟椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date loginTime;
@ApiModelProperty(value = "鎬荤櫥褰曟鏁�", example = "1")
- @ExcelColumn(name="鎬荤櫥褰曟鏁�")
private Long loginTimes;
@ApiModelProperty(value = "鎬绘帴鍗曢噺", example = "1")
- @ExcelColumn(name="鎬绘帴鍗曢噺")
private Long receiveNum;
@ApiModelProperty(value = "鎬诲彂鍗曢噺", example = "1")
- @ExcelColumn(name="鎬诲彂鍗曢噺")
private Long publishNum;
@ApiModelProperty(value = "璇勫垎", example = "1")
- @ExcelColumn(name="璇勫垎")
private BigDecimal score;
@ApiModelProperty(value = "璇勫垎鎬绘暟", example = "1")
- @ExcelColumn(name="璇勫垎鎬绘暟")
private BigDecimal totalScore;
@ApiModelProperty(value = "琚瘎浠锋�昏鍗曟暟", example = "1")
- @ExcelColumn(name="琚瘎浠锋�昏鍗曟暟")
private Integer scoreOrderNum;
@ApiModelProperty(value = "瀹氫綅鍦板潃")
- @ExcelColumn(name="瀹氫綅鍦板潃")
private String location;
@ApiModelProperty(value = "绾害", example = "1")
- @ExcelColumn(name="绾害")
private BigDecimal lat;
@ApiModelProperty(value = "缁忓害", example = "1")
- @ExcelColumn(name="缁忓害")
private BigDecimal lgt;
@ApiModelProperty(value = "鐪佷唤")
- @ExcelColumn(name="鐪佷唤")
private String province;
@ApiModelProperty(value = "鍩庡競")
- @ExcelColumn(name="鍩庡競")
private String city;
@ApiModelProperty(value = "鍖哄幙")
- @ExcelColumn(name="鍖哄幙")
private String area;
@ApiModelProperty(value = "鏄惁鎺ュ彈鑷姩娲惧崟:0=鍚︼紱1=鏄紱", example = "1")
- @ExcelColumn(name="鏄惁鎺ュ彈鑷姩娲惧崟:0=鍚︼紱1=鏄紱")
+ @ExcelColumn(name="鎺ュ彈鑷姩娲惧崟",index = 9,width = 10,valueMapping = "0=鍚�;1=鏄�;")
private Integer autoReceiveStatus;
@ApiModelProperty(value = "褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;", example = "1")
- @ExcelColumn(name="褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;")
private Integer useIdentity;
@ApiModelProperty(value = "鎴戠殑 - 鏁版嵁淇℃伅", example = "1")
@@ -197,4 +170,20 @@
@ApiModelProperty(value = "璺濈", example = "1")
@TableField(exist = false)
private BigDecimal distance;
+
+ @ApiModelProperty(value = "韬唤淇℃伅", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="韬唤",index = 5,width = 10)
+ private String identityInfo;
+
+ @ApiModelProperty(value = "鎺ュ崟璁よ瘉韬唤", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎺ュ崟璁よ瘉韬唤",index = 6,width = 10)
+ private String identityApplyInfo;
+
+ @ApiModelProperty(value = "褰撳墠浣欓锛堝厓锛�", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="褰撳墠浣欓锛堝厓锛�",index = 7,width = 10)
+ private BigDecimal amountYuan;
+
}
--
Gitblit v1.9.3