From 2c1415e6c7bf6837cb24768770b10821853a6341 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 14 一月 2026 17:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java |    1 +
 1 files changed, 1 insertions(+), 0 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 ea45030..2d18496 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
@@ -41,6 +41,7 @@
     private Integer returnMemberIntegralStatus;
     @ApiModelProperty(value = "娑堣垂杩旂Н鍒�-杩旂粡閿�鍟嗙Н鍒嗙姸鎬� 0寮�鍚� 1鍏抽棴")
     private Integer returnShopIntegralStatus;
+
     @ApiModelProperty(value = "娑堣垂杩旂Н鍒�-杩旂敤鎴风Н鍒嗘暟閲�")
     private BigDecimal returnMemberIntegral;
     @ApiModelProperty(value = "娑堣垂杩旂Н鍒�-杩旂粡閿�鍟嗙Н鍒嗘暟閲�")

--
Gitblit v1.9.3