From c51de64d5ee334d914c90f5e4f82a13f159492ca Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 四月 2026 20:08:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/OrdersRefund.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/OrdersRefund.java b/server/services/src/main/java/com/doumee/dao/business/model/OrdersRefund.java
index 8928774..7b11255 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/OrdersRefund.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/OrdersRefund.java
@@ -47,7 +47,7 @@
@ApiModelProperty(value = "璁㈠崟涓婚敭", example = "1")
private Integer orderId;
- @ApiModelProperty(value = "閫�娆炬柟寮忥細0=鏈瓨浠剁洿鎺ュ彇娑堬紱1=骞冲彴鐩存帴鍙栨秷锛�2=宸插瓨浠剁敵璇峰彇娑�", example = "0")
+ @ApiModelProperty(value = "閫�娆炬柟寮忥細0=鏈瓨浠剁洿鎺ュ彇娑堬紱1=骞冲彴鐩存帴鍙栨秷锛�2=宸插瓨浠剁敵璇峰彇娑堬紱3=璁㈠崟瀹屾垚閫�娆�", example = "0")
private Integer type;
@ApiModelProperty(value = "鍙栨秷鍘熷洜")
@@ -60,11 +60,19 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date refundTime;
- @ApiModelProperty(value = "闂ㄥ簵澶囨敞")
+ @ApiModelProperty(value = "閫�娆惧娉�")
private String refundRemark;
@ApiModelProperty(value = "骞冲彴鎿嶄綔浜猴紙type=1浣跨敤锛�", example = "0")
private Integer userId;
+ @ApiModelProperty(value = "閫�娆鹃噾棰濓紙鍒嗭級", example = "10000")
+ private Long refundAmount;
+
+ @ApiModelProperty(value = "閫�娆剧姸鎬侊細0=閫�娆句腑锛�1=閫�娆炬垚鍔燂紱2=閫�娆惧け璐�", example = "0")
+ private Integer status;
+
+ @ApiModelProperty(value = "閫�娆惧墠璁㈠崟鐘舵��", example = "1")
+ private Integer beforeStatus;
}
--
Gitblit v1.9.3