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;