Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-report/yudao-module-report-biz/pom.xml

yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/message/MpMessageRespVO.java

@@ -81,7 +81,6 @@ public class MpMessageRespVO {
      *
      * 消息类型为 {@link WxConsts.XmlMsgType} 的 NEWS
      */
-    @TableField(typeHandler = JacksonTypeHandler.class)
     private List<MpMessageDO.Article> articles;
 
     @Schema(description = "音乐链接 消息类型为 music 时，才有值", example = "https://www.iocoder.cn/xxx.mp3")

yudao-server/src/main/resources/application.yaml

@@ -308,8 +308,3 @@ yudao:
         customer: E77DF18BE109F454A5CD319E44BF5177
 
 debug: false
-
-# 积木报表配置
-jeecg:
-  jmreport:
-    saas-mode: tenant