2 Commits

Author	SHA1	Message	Date
Chuanjian Lai	32a8f7effb	Merge remote-tracking branch 'origin/master' ... # Conflicts: # ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml # ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml # ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml # sql/ry_config_20210128.sql	2021-02-22 14:59:55 +08:00
RuoYi	53076612f8	增加分布式事务seata支持	2021-01-27 10:47:01 +08:00