YunaiV 712067979c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/user-social ...

 Conflicts:

	yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/auth/impl/SysAuthServiceImpl.java

	yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/auth/SysAuthServiceImplTest.java

	yudao-dependencies/pom.xml

	yudao-framework/pom.xml

	yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/system/service/auth/impl/SysAuthServiceImpl.java

2021-12-15 09:26:47 +08:00

..

activiti

动态表单 命名规范

2021-11-04 17:35:01 +08:00

infra

优化 mq starter 组件，增加 RedisMQTemplate 模板类

2021-12-05 23:00:41 +08:00

pay

优化支付通知的逻辑，解决并发的问题。

2021-10-27 10:06:49 +08:00

system

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

2021-12-15 09:26:47 +08:00

tool

1. 管理后台，增加租户管理

2021-12-14 22:39:43 +08:00