From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/business/model/Revenue.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Revenue.java b/server/services/src/main/java/com/doumee/dao/business/model/Revenue.java
index 71f8a58..70d241c 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Revenue.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Revenue.java
@@ -34,7 +34,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelColumn(name = "鍒涘缓鏃堕棿", index = 6, width = 16, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name = "鏀舵敮鏃堕棿", index = 3, width = 16, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -54,15 +54,15 @@
private Integer memberType;
@ApiModelProperty(value = "鏄惁鐢熸晥锛�0=鍏ヨ处涓紱1=宸插叆璐︼紱")
- @ExcelColumn(name = "鏄惁鐢熸晥", valueMapping = "0=鍏ヨ处涓�;1=宸插叆璐�;", index = 5, width = 8)
+ @ExcelColumn(name = "鐘舵��", valueMapping = "0=鍏ヨ处涓�;1=宸插叆璐�;", index = 6, width = 8)
private Integer vaildStatus;
@ApiModelProperty(value = "绫诲瀷锛�0=瀹屾垚璁㈠崟锛�1=鎻愮幇鏀嚭锛�2=鎻愮幇閫�鍥烇紱3=骞冲彴濂栧姳", example = "0")
- @ExcelColumn(name = "鍙樺姩绫诲瀷", valueMapping = "0=瀹屾垚璁㈠崟;1=鎻愮幇鏀嚭;2=鎻愮幇閫�鍥�;3=骞冲彴濂栧姳;", index = 3, width = 10)
+ @ExcelColumn(name = "涓氬姟绫诲瀷", valueMapping = "0=瀹屾垚璁㈠崟;1=鎻愮幇鏀嚭;2=鎻愮幇閫�鍥�;3=骞冲彴濂栧姳;", index = 4, width = 12)
private Integer type;
@ApiModelProperty(value = "鏀舵敮绫诲瀷锛�1=鏀跺叆锛�-1=鏀嚭", example = "1")
- @ExcelColumn(name = "鏀舵敮绫诲瀷", valueMapping = "1=鏀跺叆;-1=鏀嚭;", index = 1, width = 8)
+ @ExcelColumn(name = "鏀跺叆/鏀嚭", valueMapping = "1=鏀跺叆;-1=鏀嚭;", index = 1, width = 8)
private Integer optType;
@ApiModelProperty(value = "閲戦锛堝垎锛�")
@@ -84,7 +84,7 @@
private Integer status;
@ApiModelProperty(value = "璁㈠崟鍙�")
- @ExcelColumn(name = "璁㈠崟鍙�", index = 4, width = 16)
+ @ExcelColumn(name = "浜ゆ槗鍙�", index = 5, width = 16)
private String orderNo;
@ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂�")
@@ -97,7 +97,7 @@
@ApiModelProperty(value = "鍙樺姩閲戦锛堝厓锛�")
@TableField(exist = false)
- @ExcelColumn(name = "鍙樺姩閲戦(鍏�)", index = 2, width = 10)
+ @ExcelColumn(name = "閲戦锛堝厓锛�", index = 2, width = 10)
private Double amountInfo;
}
--
Gitblit v1.9.3