From b20304da294b09af51b0b758059766d8f7f858eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 5 Aug 2026 23:45:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(cms):=20=E5=A2=9E=E5=8A=A0=E7=BD=91?=
 =?UTF-8?q?=E7=AB=99=E5=9B=BE=E6=A0=87=E4=B8=8E=E5=93=81=E7=89=8C=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 CmsWebsiteServiceImplHelper 中新增 icon 和 avatar 字段映射
- 使 icon 对应 website_icon 用于前端 favicon 及网站设置
- 使 avatar 对应 website_avatar 作为品牌图标，与 icon 区分用途
- 在 ShopVo 中添加 icon 和 avatar 字段及对应注释说明
- 保持 avatar 键名与前端 SiteInfo.avatar 一致
---
 .../cms/service/impl/CmsWebsiteServiceImplHelper.java        | 4 ++++
 src/main/java/com/gxwebsoft/shop/vo/ShopVo.java              | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java
index 173384b..1883c44 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImplHelper.java
@@ -67,6 +67,10 @@ public class CmsWebsiteServiceImplHelper {
     vo.setDescription(website.getComments());
     vo.setLogo(website.getWebsiteLogo());
     vo.setMpQrCode(website.getWebsiteDarkLogo());
+    // 网站图标（favicon / 应用卡图标）：接通 website_icon 列，供前端「网站设置」上传与后台标签页 favicon 使用
+    vo.setIcon(website.getWebsiteIcon());
+    // 品牌图标（应用卡 / 分享图标）：接通 website_avatar 列，但 ShopVo 键名用 avatar 以对齐前端 SiteInfo.avatar，与 icon(favicon) 用途分离
+    vo.setAvatar(website.getWebsiteAvatar());
     vo.setDomain(website.getDomain());
     vo.setAdminUrl(website.getAdminUrl());
     vo.setApiUrl(website.getApiUrl());
diff --git a/src/main/java/com/gxwebsoft/shop/vo/ShopVo.java b/src/main/java/com/gxwebsoft/shop/vo/ShopVo.java
index e46906f..65187af 100644
--- a/src/main/java/com/gxwebsoft/shop/vo/ShopVo.java
+++ b/src/main/java/com/gxwebsoft/shop/vo/ShopVo.java
@@ -42,9 +42,12 @@ public class ShopVo implements Serializable {
     @Schema(description = "LOGO")
     private String logo;
 
-    @Schema(description = "图标")
+    @Schema(description = "图标(favicon/应用卡图标)，对应 cms_website.website_icon")
     private String icon;
 
+    @Schema(description = "品牌图标(应用卡/分享图标)，对应 cms_website.website_avatar，与 icon 用途分离；JSON 键名用 avatar 以对齐前端")
+    private String avatar;
+
     @Schema(description = "域名")
     private String domain;