From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化

---
 server/services/src/main/java/com/doumee/dao/business/model/WxBill.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java b/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java
index 9bfcd66..f523b05 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java
@@ -69,17 +69,33 @@
     @ApiModelProperty(value = "鑷杞︽敹鍏�", example = "1")
     @ExcelColumn(name="鑷杞︽敹鍏�")
     private BigDecimal bikeFee;
+    @ApiModelProperty(value = "濂楅鏀跺叆", example = "1")
+    @ExcelColumn(name="濂楅鏀跺叆")
+    private BigDecimal discountFee;
+    @ApiModelProperty(value = "楠戣璁㈠崟閫�娆�", example = "1")
+    @ExcelColumn(name="楠戣璁㈠崟閫�娆�")
+    private BigDecimal bikeRefundFee;
+    @ApiModelProperty(value = "濂楅鍗¢��娆炬�婚噾棰�", example = "1")
+    @ExcelColumn(name="濂楅鍗¢��娆炬�婚噾棰�")
+    private BigDecimal discountRefundFee;
+    @ApiModelProperty(value = "楠戣璁㈠崟閫�娆炬墜缁垂", example = "1")
+    @ExcelColumn(name="楠戣璁㈠崟閫�娆炬墜缁垂")
+    private BigDecimal bikeRefundCmmsAmt;
+    @ApiModelProperty(value = "濂楅鍗¢��娆炬�婚噾棰濇墜缁垂", example = "1")
+    @ExcelColumn(name="濂楅鍗¢��娆炬�婚噾棰濇墜缁垂")
+    private BigDecimal discountRefundCmmsAmt;
+
     @ApiModelProperty(value = "鍚屾寰俊璐﹀崟鏃ユ湡", example = "2023-10-08")
     @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
     @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "20231008")
     @TableField(exist = false)
-    @JsonFormat(pattern = "yyyyMMdd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:sss")
     private Date startDate;
     @ApiModelProperty(value = "鏌ヨ鎴鏃ユ湡锛堝寘鍚級", example = "20231008")
     @TableField(exist = false)
-    @JsonFormat(pattern = "yyyyMMdd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:sss")
     private Date endDate;
 
 }

--
Gitblit v1.9.3