疯狂的狮子li 75b22e9a23 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ...

 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

	ruoyi-ui/package.json

	ruoyi-ui/src/main.js

	ruoyi-ui/src/views/monitor/job/index.vue

	ruoyi-ui/src/views/monitor/job/log.vue

	ruoyi-ui/src/views/monitor/logininfor/index.vue

	ruoyi-ui/src/views/monitor/operlog/index.vue

	ruoyi-ui/src/views/system/config/index.vue

	ruoyi-ui/src/views/system/dict/data.vue

	ruoyi-ui/src/views/system/dict/index.vue

	ruoyi-ui/src/views/system/post/index.vue

	ruoyi-ui/src/views/system/role/index.vue

	ruoyi-ui/src/views/system/user/index.vue

	ruoyi-ui/src/views/tool/build/index.vue

	ruoyi-ui/src/views/tool/gen/index.vue

2021-09-27 16:50:26 +08:00

..

src/main/java/com/ruoyi/framework

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

2021-09-27 16:50:26 +08:00

pom.xml

update 调整依赖结构 解决依赖冲突

2021-09-22 11:10:10 +08:00