YunaiV 6aca4ae9fd Merge branch 'feature/multi-module' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/flowable ...

 Conflicts:

	pom.xml

	yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/config/BpmActivitiConfiguration.java

2022-01-29 10:06:00 +08:00

..

main/java/cn/iocoder/yudao/coreservice/modules

Merge branch 'feature/multi-module' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/flowable

2022-01-29 10:06:00 +08:00

test

* 【升级】redisson from 3.16.3 to 3.16.6，解决 Stream 在调试场景下会存在 NPE 的问题

2021-12-16 09:08:05 +08:00

test-integration

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

2021-12-16 09:45:50 +08:00