YunaiV 4b2af44ee3 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti ...

 Conflicts:

	sql/ruoyi-vue-pro.sql

	yudao-admin-server/src/main/resources/application.yaml

	yudao-admin-server/src/main/resources/mybatis-config/mybatis-config.xml

	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/LoginUser.java

	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/util/SecurityFrameworkUtils.java

2021-12-30 19:58:31 +08:00

..

codegen

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

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

mybatis-config

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

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

processes

修改请假流程

2021-11-07 17:38:00 +08:00

application-dev.yaml

修改本地不开 Job，dev 开启 Job

2021-12-05 17:35:53 +08:00

application-local.yaml

修改本地不开 Job，dev 开启 Job

2021-12-05 17:35:53 +08:00

application.yaml

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

2021-12-30 19:58:31 +08:00

banner.txt

再次调整项目结构

2021-04-28 00:01:14 +08:00

logback-spring.xml

1. 修改日志 2.回退提交测试代码 3. 修改配置

2021-07-25 18:59:20 +08:00