From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/dao/business/web/response/PayOrderDTO.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/PayOrderDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/PayOrderDTO.java
index 940dfed..9fc12ee 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/PayOrderDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/PayOrderDTO.java
@@ -1,6 +1,8 @@
 package com.doumee.dao.business.web.response;
 
+import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -13,14 +15,23 @@
 @ApiModel("浜ゆ槗鏄庣粏")
 public class PayOrderDTO {
 
+    @ApiModelProperty(value = "璁㈠崟缂栫爜")
     private String orderCode;
+    @ApiModelProperty(value = "浜ゆ槗鍗曞彿")
+    private String onlineorderId;
+    @ApiModelProperty(value = "璁㈠崟涓婚敭")
+    private String id;
 
-    private Integer payType;
+    @ApiModelProperty(value = "鏀粯鏂瑰紡 0寰俊 1鏀粯瀹�")
+    private Integer payWay;
 
+    @ApiModelProperty(value = "閫�娆剧被鍨� 0缁撶畻閫�娆� 1寮哄埗缁撶畻閫�娆� 2缁撶畻鍚庨��娆� [99: 铏氭嫙type 鏀粯鎶奸噾]")
     private Integer refundType;
 
+    @ApiModelProperty(value = "浜ゆ槗閲戦")
     private BigDecimal money;
 
+    @ApiModelProperty(value = "鏀粯鏃堕棿")
     private Date payDate;
 
 }

--
Gitblit v1.9.3