From e68e324f91d1a4eb2d4c5f07d27ca105a308bc0c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 20 一月 2026 18:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java b/server/dmmall_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java
index 59a3cdb..88b1822 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java
@@ -32,7 +32,7 @@
     @ApiModelProperty(value = "閭�璇峰ソ鍙嬬Н鍒嗗鍔辨暟閲�")
     private BigDecimal shareIntegralReward;
 
-    @ApiModelProperty(value = "娉ㄥ唽浼樻儬鍒稿鍔遍泦鍚�")
+    @ApiModelProperty(value = "娉ㄥ唽浼樻儬鍒稿鍔遍泦鍚�") //[{"num":"2","couponId":6},{"num":"3","couponId":5}]
     private List<JSONObject> regCouponRewardList;
     @ApiModelProperty(value = "閭�璇峰ソ鍙嬩紭鎯犲埜濂栧姳闆嗗悎")
     private List<JSONObject> shareCouponRewardList;

--
Gitblit v1.9.3