Commit Graph

10 Commits

Author SHA1 Message Date
c206f938ba 发布 v3.0.0 2021-08-18 11:45:51 +08:00
3f3a7db544 发布 v2.6.0 2021-07-28 11:32:30 +08:00
a3e781915e fix 修复多数据源druid全局配置缩进错误 引起无效配置问题 2021-07-24 18:24:29 +08:00
007a6d0c88 发布 v2.5.0 2021-07-12 11:36:37 +08:00
03c459e5a3 同步 dev 分支 2021-06-23 10:02:55 +08:00
801f7cd8f7 发布 2.3.1 2021-06-04 16:20:12 +08:00
59ef30b156 发布 2.3.0 2021-06-01 10:53:30 +08:00
687d746b1b 正式发布 v2.0.0 2021-05-14 21:39:30 +08:00
f28029fade Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into fast
 Conflicts:
	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
	ruoyi/src/main/resources/application-prod.yml
2021-04-14 13:33:01 +08:00
2ba304819d init 单模块项目 2021-04-02 15:59:05 +08:00