From 7b223c4dfdc960a6172bac87e47ab1b86b90ba1a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 21 一月 2026 09:47:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderPayConfirmResponse.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderPayConfirmResponse.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderPayConfirmResponse.java
index c3c1275..5169238 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderPayConfirmResponse.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderPayConfirmResponse.java
@@ -24,8 +24,6 @@
     @ApiModelProperty(value = "浼樻儬鍒告姷鎵ｉ噾棰�", example = "1")
     private BigDecimal couponAmount;
 
-
-
     @ApiModelProperty(value = "绉垎浣跨敤鐘舵�侊細0=鍙敤锛�1=涓嶅彲鐢�", example = "1")
     private Integer integralStatus;
 

--
Gitblit v1.9.3