Merge branch 'refs/heads/feature-2025-cms' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -95,10 +95,9 @@ public enum NoticeMessageTypeEnum {
     POTENTIAL_CUSTOMER_NOTIFY(6003, "销售线索通知", NoticeMessageCategoryTypeEnum.POTENTIAL_CUSTOMER.getType(), "potential_customer_notify", "/pages/route/index?pageType=", "hbapp_sales_clue_center", "salesLeadNotice", "haobanNotice"),
     MATERIAL_REPORT_NOTIFY_MONTH(6004, "素材月报通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "material_month_notify", "/pages/route/index?pageType=", "hbapp_mate_report", "materialMonth", "clerkMaterialsReport"),
     CLERK_COMMISSION_NOTIFY(6005, "客户下单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "clerk_commission_notify", "/pages/route/index?pageType=", "hbapp_withdraw_list", "clerkCommissionNotify", "haobanNotice"),
-
     MATERIAL_AUDIT_NOTIFY(6006, "素材审核通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "material_audit_notify", "/pages/route/index?pageType=", "hbapp_create_center", "materialAuditNotify", "haobanNotice"),
-
     KNOWLEDGE_NEW_NOTIFY(6007, "知识库上新通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "knowledge_new_notify", "/pages/route/index?pageType=", "hbapp_guide_knowledge", "knowledgeNewNotify", "clerkMaterialsNotice"),
+    APPOINT_MATERIAL_NEW_NOTIFY(6008, "素材上新通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "appoint_material_new_notify", "/pages/route/index?pageType=", "hbapp_material_notice", "appointMaterialsNotice", "clerkMaterialsNotice"),
 
     CASH_APPLY_REFUSE_NOTIFY(7001,"提现通知", NoticeMessageCategoryTypeEnum.OTHER.getType(),"cash_apply_refuse_notify","/pages/route/index?pageType=","hbapp_withdraw_list","cashApplyRefuseNotify","haobanNotice"),
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialInfoVO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.gic.content.api.dto.additional.ContentMaterialAdditionalDTO;
 import com.gic.content.api.dto.ext.ContentMaterialExt;
+import com.gic.content.api.dto.material.ContentMaterialJson;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
@@ -43,6 +44,11 @@ public class ContentMaterialInfoVO implements Serializable {
     private String materialContent;
 
     /**
+     * 素材JSON内容
+     */
+    private ContentMaterialJson materialJson;
+
+    /**
      * 素材类型1图文2纯文字3纯图片4视频5图文/视频6文件7富文本
      */
     private Integer materialType;
@@ -237,6 +243,14 @@ public class ContentMaterialInfoVO implements Serializable {
         this.materialContent = materialContent;
     }
 
+    public ContentMaterialJson getMaterialJson() {
+        return materialJson;
+    }
+
+    public void setMaterialJson(ContentMaterialJson materialJson) {
+        this.materialJson = materialJson;
+    }
+
     public Integer getMaterialType() {
         return materialType;
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/creative/ContentMaterialVO.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.vo.content.creative;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gic.content.api.dto.material.ContentMaterialJson;
 
 import java.util.Date;
 import java.util.List;
@@ -52,6 +53,10 @@ public class ContentMaterialVO extends ContentMaterialConvsVO{
      */
     private String materialContent;
     /**
+     * 素材JSON内容
+     */
+    private ContentMaterialJson materialJson;
+    /**
      * 素材图片url列表
      */
     private String materialImageUrls;
@@ -193,6 +198,14 @@ public class ContentMaterialVO extends ContentMaterialConvsVO{
         this.materialContent = materialContent;
     }
 
+    public ContentMaterialJson getMaterialJson() {
+        return materialJson;
+    }
+
+    public void setMaterialJson(ContentMaterialJson materialJson) {
+        this.materialJson = materialJson;
+    }
+
     public String getMaterialImageUrls() {
         return materialImageUrls;
     }