From 04dba6a17f836b5fbdf0eedff8a129c6785fd8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 18:25:00 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/dao/business/model/Refund.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
index cf5e7c8..2e4bc77 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
@@ -61,7 +61,7 @@
@ApiModelProperty(value = "鍙��閲戦", example = "1")
@ExcelColumn(name="鍙��鍥炴娂閲戯紙鍏冿級" )
- private BigDecimal canBanlance;
+ private BigDecimal canBalance;
@ApiModelProperty(value = "浜ゆ槗閲戦", example = "1")
@ExcelColumn(name="浜ゆ槗閲戦")
@@ -82,14 +82,16 @@
@ApiModelProperty(value = "閫�娆炬柟寮� 0寰俊 1鏀粯瀹�", example = "1")
@ExcelColumn(name="閫�娆炬柟寮� 0寰俊 1鏀粯瀹�")
private Integer payWay;
-
+ @ApiModelProperty(value = "濂楅鍗￠��娆剧被鍨� 0閫�璐ч��娆� 1浠呴��娆�")
+ @ExcelColumn(name="濂楅鍗￠��娆剧被鍨� 0閫�璐ч��娆� 1浠呴��娆�")
+ private String discountType;
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
@ExcelColumn(name="瀹屾垚鏃堕棿")
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date doneDate;
- @ApiModelProperty(value = "閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'", example = "1")
- @ExcelColumn(name="閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'")
+ @ApiModelProperty(value = "閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆� 4濂楅鍗￠��娆�'", example = "1")
+ @ExcelColumn(name="閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 4濂楅鍗￠��娆�'")
private Integer type;
@ApiModelProperty(value = "閫�娆剧被鍨� 0缁撶畻閫�娆� 1寮哄埗缁撶畻閫�娆� 2缁撶畻鍚庨��娆�", example = "1")
@TableField(exist = false)
@@ -114,6 +116,7 @@
private String payOnlineOrderid;
+
@ApiModelProperty(value = "浜ゆ槗绗旀暟", example = "0")
@TableField(exist = false)
private int countNum;
--
Gitblit v1.9.3