From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/Member.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Member.java b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
index beba41d..2976561 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -54,11 +56,9 @@
private Integer applyId;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- @ExcelColumn(name="淇濋櫓鐢熸晥姝㈡湡",index = 9,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
- @ExcelColumn(name="淇濋櫓鐢熸晥璧锋湡",index = 8,width = 12,dateFormat="yyyy-MM-dd HH:mm:ss")
private Date startTime;
@ApiModelProperty(value = "韬唤璇佸彿鐮�")
@@ -78,17 +78,14 @@
private Integer sex;
@ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О")
- @ExcelColumn(name="淇濋櫓鏂规",index = 5,width = 10)
@TableField(exist = false)
private String solutionName;
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
- @ExcelColumn(name="娲鹃仯鍗曚綅",index = 6,width = 10)
@TableField(exist = false)
private String duName;
@ApiModelProperty(value = "鎵�灞炲伐绉嶅悕绉�")
- @ExcelColumn(name="鎵�灞炲伐绉�",index = 7,width = 20)
@TableField(exist = false)
private String workTypeName;
@@ -97,7 +94,6 @@
private String companyName;
@ApiModelProperty(value = "淇濋櫓鐘舵��:1=淇濋殰涓�;2=涓嶅湪淇�")
- @ExcelColumn(name="淇濋櫓鐘舵��",index = 1,valueMapping = "1=淇濋殰涓�;2=涓嶅湪淇�;",width = 6)
@TableField(exist = false)
private Integer solutionsStatus;
@@ -111,4 +107,40 @@
@TableField(exist = false)
private Integer sn;
+
+ @ApiModelProperty(value = "淇濋櫓鏂规涓婚敭")
+ @TableField(exist = false)
+ private Integer solutionId;
+
+ @ApiModelProperty(value = "璐圭敤")
+ @TableField(exist = false)
+ private BigDecimal fee;
+
+ @ApiModelProperty(value = "淇濆崟鏄庣粏琛屽疄闄呭紑濮嬫棩鏈�")
+ @TableField(exist = false)
+ private Date detailStartTime;
+
+ @ApiModelProperty(value = "淇濆崟鏄庣粏琛屽疄闄呯粨鏉熸棩鏈�")
+ @TableField(exist = false)
+ private Date detailEndTime;
+
+ @ApiModelProperty(value = "淇濆崟鏄庣粏琛屾湇鍔¤垂")
+ @TableField(exist = false)
+ private BigDecimal detailServerCost;
+
+ @ApiModelProperty(value = "宸叉姇淇濆崟", example = "1")
+ @ExcelColumn(name="宸叉姇淇濆崟",index = 5,width = 8)
+ @TableField(exist = false)
+ private Integer totalNum;
+
+ @ApiModelProperty(value = "淇濋殰涓�", example = "1")
+ @ExcelColumn(name="淇濋殰涓�",index = 6,width = 8)
+ @TableField(exist = false)
+ private Integer validNum;
+
+ @ApiModelProperty(value = "涓嶅湪淇�", example = "1")
+ @ExcelColumn(name="涓嶅湪淇�",index = 7,width = 8)
+ @TableField(exist = false)
+ private Integer invalidNum;
+
}
--
Gitblit v1.9.3