BJ_ZTEITS-Developers / parking-cloud-yudao

Merge pull request !1038 from Cyrix66/N/A

Merge pull request !1035 from Ordinary/master-jdk17

此PR同我之前提交的#1029号PR，解决【system_menu】菜单的 AI 音乐的组件名称命名错误问题。

https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1029

Signed-off-by: Cyrix66 <120878696@qq.com>

fix: insertOrUpdate死循环问题

# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/AliyunSmsClient.java

Merge pull request !1034 from 卢越/master-jdk17

Merge pull request !1032 from 卢越/master-jdk17

Merge pull request !1031 from puhui999/develop

Merge pull request !1030 from scholarli/develop

# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java

【优化】数据脱敏支持 Spring el 表达式，支持根据权限控制脱敏