From 49c5117caef44d1e817d2ef701529dfaf1443467 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 六月 2025 16:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
index 6ddda72..966e899 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
@@ -268,6 +268,14 @@
             mgtAllCustomConfigVo.setLinkUrl(advert.getLinkUrl());
             mgtAllCustomConfigVo.setJumpType(advert.getJumpType());
             mgtAllCustomConfigVo.setJumpId(advert.getJumpId());
+            mgtAllCustomConfigVo.setAppid(advert.getAppid());
+            //广告语
+            mgtAllCustomConfigVo.setTargetTypeSlogan(advert.getTargetTypeSlogan());
+            mgtAllCustomConfigVo.setLinkTypeSlogan(advert.getLinkTypeSlogan());
+            mgtAllCustomConfigVo.setLinkUrlSlogan(advert.getLinkUrlSlogan());
+            mgtAllCustomConfigVo.setJumpTypeSlogan(advert.getJumpTypeSlogan());
+            mgtAllCustomConfigVo.setJumpIdSlogan(advert.getJumpIdSlogan());
+            mgtAllCustomConfigVo.setAppidSlogan(advert.getAppidSlogan());
         }
         //获取活跃度配置
         List<Activeness> activenessList = activenessService.listActiveness();

--
Gitblit v1.7.1