From 4e3e18cdb0d75c098b68353ef8c86cdd7c0f79b2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 21 八月 2025 15:27:34 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/dao/business/model/Member.java |   63 +++++++++++++++++++++++++++++--
 1 files changed, 58 insertions(+), 5 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 a753400..474874c 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
@@ -1,11 +1,14 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.vo.UserCenterVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
@@ -21,13 +24,14 @@
 @TableName("`member`")
 public class Member {
 
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
     @ExcelColumn(name="涓婚敭")
     private Integer id;
 
     @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
     @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
-    private Byte deleted;
+    private Integer deleted;
 
     @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
     @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
@@ -35,7 +39,6 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -106,7 +109,7 @@
 
     @ApiModelProperty(value = "鎬绘帴鍗曢噺", example = "1")
     @ExcelColumn(name="鎬绘帴鍗曢噺")
-    private Long reciveNum;
+    private Long receiveNum;
 
     @ApiModelProperty(value = "鎬诲彂鍗曢噺", example = "1")
     @ExcelColumn(name="鎬诲彂鍗曢噺")
@@ -116,9 +119,19 @@
     @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 localtion;
+    private String location;
 
     @ApiModelProperty(value = "绾害", example = "1")
     @ExcelColumn(name="绾害")
@@ -142,6 +155,46 @@
 
     @ApiModelProperty(value = "鏄惁鎺ュ彈鑷姩娲惧崟:0=鍚︼紱1=鏄紱", example = "1")
     @ExcelColumn(name="鏄惁鎺ュ彈鑷姩娲惧崟:0=鍚︼紱1=鏄紱")
-    private Integer autoReciveStatus;
+    private Integer autoReceiveStatus;
 
+    @ApiModelProperty(value = "褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;", example = "1")
+    @ExcelColumn(name="褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;")
+    private Integer useIdentity;
+
+    @ApiModelProperty(value = "鎴戠殑 - 鏁版嵁淇℃伅", example = "1")
+    @TableField(exist = false)
+    private UserCenterVO userCenterVO;
+    @ApiModelProperty(value = "鍙樻煡璇㈠紑濮嬫椂闂�", example = "1")
+    @TableField(exist = false)
+    private Date startTime;
+    @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;
+
+    @ApiModelProperty(value = "鎺ュ崟鏉冮噸", example = "1")
+    @TableField(exist = false)
+    private Integer level;
+
+    @ApiModelProperty(value = "璺濈", example = "1")
+    @TableField(exist = false)
+    private BigDecimal distance;
 }

--
Gitblit v1.9.3