From 55ba702c1df240929e68df3b42fa9cb0607378b8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 九月 2025 10:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/dao/business/model/WxBill.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 e3385c6..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,6 +69,22 @@
@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")
--
Gitblit v1.9.3