github/ruoyi-vue-pro
1
0
Fork 0
mirror of https://github.com/YunaiV/ruoyi-vue-pro.git synced 2026-03-30 03:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	yudao-server/src/main/resources/application-dev.yaml
#	yudao-server/src/main/resources/application-local.yaml
This commit is contained in:
YunaiV
2025-11-29 09:59:28 +08:00
parent e1bac0818f f7042897ff
commit ffd822c703
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java
View File

@@ -68,7 +68,7 @@ public class SocialClientSaveReqVO {
@JsonIgnore
public boolean isPublicKeyValid() {
// 如果是支付宝，必须填写 publicKey 属性
return !Objects.equals(socialType, SocialTypeEnum.ALIPAY.getType())
return !Objects.equals(socialType, SocialTypeEnum.ALIPAY_MINI_PROGRAM.getType())
|| !StrUtil.isEmpty(publicKey);
}