From 67c98cdd79a1e473fe95ddc1c695ed162c176510 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 15:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 8ded3a7..fbbcd18 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
@@ -118,6 +118,16 @@
@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;
@@ -146,7 +156,6 @@
@ExcelColumn(name="鏄惁鎺ュ彈鑷姩娲惧崟:0=鍚︼紱1=鏄紱")
private Integer autoReceiveStatus;
-
@ApiModelProperty(value = "褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;", example = "1")
@ExcelColumn(name="褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;")
private Integer useIdentity;
@@ -160,5 +169,24 @@
@ApiModelProperty(value = "鍙樻煡璇㈢粨鏉熸椂闂�", example = "1")
@TableField(exist = false)
private Date endTime;
+ @ApiModelProperty(value = "褰撳墠浣跨敤韬唤:0=鍙戝崟鏂�;1=鎺ュ崟鏂�;", example = "1")
+ @TableField(exist = false)
+ private Integer type;
+
+ @ApiModelProperty(value = "澶村儚鍏ㄨ矾寰�")
+ @TableField(exist = false)
+ private String fullCoverImage;
+
+ @ApiModelProperty(value = "鐢ㄥ伐韬唤", example = "1")
+ @TableField(exist = false)
+ private IdentityInfo workerIdentityModel;
+
+ @ApiModelProperty(value = "鍙告満韬唤淇℃伅", example = "1")
+ @TableField(exist = false)
+ private IdentityInfo driverIdentityModel;
+
+ @ApiModelProperty(value = "閫侀韬唤淇℃伅", example = "1")
+ @TableField(exist = false)
+ private IdentityInfo chefIdentityModel;
}
--
Gitblit v1.9.3