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

 Conflicts:

	ruoyi-admin/src/main/resources/application-prod.yml

	ruoyi-generator/src/main/resources/vm/java/controller.java.vm

	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

	ruoyi-ui/src/assets/styles/ruoyi.scss

	ruoyi-ui/src/assets/styles/sidebar.scss

	ruoyi-ui/src/layout/components/Navbar.vue

	ruoyi-ui/src/layout/components/Settings/index.vue

	ruoyi-ui/src/layout/components/TagsView/index.vue

	ruoyi-ui/src/settings.js

	ruoyi-ui/src/store/getters.js

	ruoyi-ui/src/store/modules/permission.js

	ruoyi-ui/src/store/modules/settings.js

	ruoyi-ui/src/store/modules/tagsView.js

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

2021-04-14 13:22:31 +08:00

..

src/main

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

2021-04-14 13:22:31 +08:00

pom.xml

update 移除无用依赖

2021-03-15 17:50:24 +08:00