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

# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbAndRedisUnitTest.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/vo/AppMemberPointRecordRespVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java

2024-01-20 00:51:03 +08:00

..

yudao-module-system-api

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

2024-01-20 00:44:03 +08:00

yudao-module-system-biz

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

2024-01-19 22:52:19 +08:00

pom.xml

1. 【修复】单元测试报错

2022-04-22 00:07:54 +08:00