From c4bd6e7e1fadfac44466d589ee4d5dfcf77c2a59 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 09:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 6e5d6c4..e9311ab 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
@@ -38,7 +38,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -119,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;
@@ -155,6 +164,11 @@
@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;
}
--
Gitblit v1.9.3