szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
YunaiV 2024-07-14 21:58:59 +08:00
parent 85090b8224 211e196fce
commit 438078d28f
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

7
yudao-server/src/main/resources/application.yaml
View File

@ -307,9 +307,4 @@ yudao:
key: pLXUGAwK5305 key: pLXUGAwK5305
customer: E77DF18BE109F454A5CD319E44BF5177 customer: E77DF18BE109F454A5CD319E44BF5177
debug: false debug: false
# 积木报表配置
jeecg:
jmreport:
saas-mode: tenant