From abbe8408d07e4f1ac5e7a96e20638f346338cc3a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 14 四月 2025 10:35:38 +0800
Subject: [PATCH] 111
---
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