Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts: # pom.xml # yudao-dependencies/pom.xml # yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java # yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
This commit is contained in:
@@ -197,7 +197,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
|
||||
channelMapper.insert(dbChannel);// @Sql: 先插入出一条存在的数据
|
||||
// 准备参数
|
||||
Long appId = dbChannel.getAppId();
|
||||
String code = dbChannel.getCode();;
|
||||
String code = dbChannel.getCode();
|
||||
|
||||
// 调用
|
||||
PayChannelDO channel = channelService.getChannelByAppIdAndCode(appId, code);
|
||||
|
Reference in New Issue
Block a user