Merge branch 'refs/heads/cc_20250826_notice' into cc_20250903_big_screen

coolstore-partner-dao/src/main/resources/mapper/MessageTemplateMapper.xml

@@ -77,6 +77,8 @@
         create_user_id as createUserId,
         create_time as createTime,
         handle_person_info as handlePersonInfo,
+        jump_type as jumpType,
+        jump_url as jumpUrl,
         store_info as storeInfo
     FROM zxjp_message_template
     WHERE deleted = 0

coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java

@@ -79,4 +79,8 @@ public class NoticeDTO {
 
     private String storeInfo;
 
+    private Integer jumpType;
+
+    private String jumpUrl;
+
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java

@@ -247,7 +247,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
             //组装人员信息
             List<CommonDTO> userList = new ArrayList<>();
             userInfoByUserMobileList.forEach(x -> {
-                CommonDTO user = new CommonDTO("user", x.getUserId(), x.getName());
+                CommonDTO user = new CommonDTO("person", x.getUserId(), x.getName());
                 userList.add(user);
             });
             userInfo = JSONObject.toJSONString(userList);