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

…vue-pro # Conflicts: # yudao-module-pay/yudao-module-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayChannelMapperIntegrationTest.java # yudao-module-pay/yudao-module-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceIntegrationTest.java # yudao-module-pay/yudao-module-pay-biz/src/test-integration/resources/application-integration-test.yaml
YunaiV · Jul 21, 2024 · 14cc447 · 14cc447
2 parents cd13d26 + 9e84834
commit 14cc447
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 335 deletions.
diff --git a/...ntegration/java/cn/iocoder/yudao/module/pay/dal/dataobject/merchant/PayChannelDOTest.java b/...ntegration/java/cn/iocoder/yudao/module/pay/dal/dataobject/merchant/PayChannelDOTest.java
diff --git a/.../java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayChannelMapperIntegrationTest.java b/.../java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayChannelMapperIntegrationTest.java
diff --git a/...ration/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceIntegrationTest.java b/...ration/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceIntegrationTest.java
diff --git a/...e-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/service/package-info.java b/...e-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/service/package-info.java
diff --git a/...test-integration/java/cn/iocoder/yudao/module/pay/test/BaseDbAndRedisIntegrationTest.java b/...test-integration/java/cn/iocoder/yudao/module/pay/test/BaseDbAndRedisIntegrationTest.java
diff --git a/...biz/src/test-integration/java/cn/iocoder/yudao/module/pay/test/BaseDbIntegrationTest.java b/...biz/src/test-integration/java/cn/iocoder/yudao/module/pay/test/BaseDbIntegrationTest.java
diff --git a/.../src/test-integration/java/cn/iocoder/yudao/module/pay/test/BaseRedisIntegrationTest.java b/.../src/test-integration/java/cn/iocoder/yudao/module/pay/test/BaseRedisIntegrationTest.java
diff --git a/...pay/yudao-module-pay-biz/src/test-integration/resources/application-integration-test.yaml b/...pay/yudao-module-pay-biz/src/test-integration/resources/application-integration-test.yaml