Merge branch 'master' into cc_20251112_wallet

coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

@@ -212,7 +212,9 @@ public enum ErrorCodeEnum {
 
     INVOICING_EXIST(109016, "当前门店发票信息已存在！", null),
 
-    SHOP_STATUS_NOT_SUPPORT_HANDLER(109016, "当前门店状态为:{0},不能进行结束跟进操作", null),
+    SHOP_STATUS_NOT_SUPPORT_HANDLER(109017, "当前门店状态为:{0},不能进行结束跟进操作", null),
+
+    SYSTEM_NAME_NOT__SUPPORT(109018, "请不要使用系统默认店名！", null),
 
 
     INSERT_OPENING_OPERATION_PLAN_AUDIT_FALSE(103001,"插入运营方案审核信息失败",null),

coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java

@@ -69,7 +69,8 @@ public enum UserRoleEnum {
 
     JING_DONG_OPERATIONS_CUSTOMER(500000000L,"京东运营大区客服"),
     JING_DONG_HEADQUARTERS_BUILD_CUSTOMER(510000000L,"京东总部建店客服"),
-    FRANCHISEES(530000000L,"加盟商")
+    FRANCHISEES(530000000L,"加盟商"),
+    SERVICE_PACKAGE_DEDICATED(1725431698852L,"服务包专用"),
     ;
 
     private Long code;

coolstore-partner-common/src/main/java/com/cool/store/enums/notice/ModuleCodeEnum.java

@@ -10,9 +10,9 @@ import java.util.List;
  */
 public enum ModuleCodeEnum {
 
-    STORE_WORK(0,"店务日清/培训", Arrays.asList(MatterTypeEnum.QUESTION,MatterTypeEnum.LICENSE)),
-    PRODUCT_UPDATE(1,"营销政策/产品上新",Arrays.asList(MatterTypeEnum.SERVICE_PACKAGE)),
-    INVENTORY_MODULE(2,"原料订货与库存管理",Arrays.asList(MatterTypeEnum.RESTOCK,MatterTypeEnum.INVENTORY,MatterTypeEnum.LOGISTICS)),
+    STORE_WORK(0,"店务/培训", Arrays.asList(MatterTypeEnum.QUESTION,MatterTypeEnum.LICENSE)),
+    PRODUCT_UPDATE(1,"营销/上新",Arrays.asList(MatterTypeEnum.SERVICE_PACKAGE)),
+    INVENTORY_MODULE(2,"订货/库存",Arrays.asList(MatterTypeEnum.RESTOCK,MatterTypeEnum.INVENTORY,MatterTypeEnum.LOGISTICS)),
     DISH(3,"菜品",Arrays.asList(MatterTypeEnum.NOTICE)),
     FRANCHISE(4,"加盟",Arrays.asList(MatterTypeEnum.NOTICE)),
     //其他（投诉与客户服务、临时通知）