From de65fa1dd859ecc9c57992932114a75a63841ba7 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 1 Oct 2025 17:00:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(scenic):=20=E6=B7=BB=E5=8A=A0=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0URL=E9=85=8D=E7=BD=AE=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在ScenicConfigResp中新增watermarkUrl字段
- 在AppScenicController中设置水印URL配置项
- 支持从scenicConfig中获取watermark_url配置值
---
 .../com/ycwl/basic/controller/mobile/AppScenicController.java    | 1 +
 .../com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java
index 2e8b2e80..0dfe54e3 100644
--- a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java
+++ b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java
@@ -92,6 +92,7 @@ public class AppScenicController {
         resp.setEnableVoucher(scenicConfig.getBoolean("voucher_enable", false)); // compactible
         resp.setGroupingEnable(scenicConfig.getBoolean("grouping_enable", false));
         resp.setShowPhotoWhenWaiting(scenicConfig.getBoolean("show_photo_when_waiting", false));
+        resp.setWatermarkUrl(scenicConfig.getString("watermark_url"));
         return ApiResponse.success(resp);
     }
 
diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java
index 42c3a22f..3a9c9a36 100644
--- a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java
+++ b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java
@@ -49,4 +49,5 @@ public class ScenicConfigResp {
     private Boolean enableVoucher;
     private Boolean groupingEnable;
     private Boolean showPhotoWhenWaiting;
+    private String watermarkUrl;
 }