8 Commits

Author SHA1 Message Date
疯狂的狮子li
c822e2f6cc Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-ui/src/views/monitor/druid/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/tool/swagger/index.vue
2021-06-22 16:56:38 +08:00
RuoYi
3f05ed6ffa 封装iframe组件 2021-06-17 20:17:42 +08:00
疯狂的狮子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
RuoYi
ff09e1cf55 数据监控默认地址修改 2021-04-13 18:15:11 +08:00
疯狂的狮子li
2841620be6 初始化项目 2020-02-13 10:48:51 +08:00
疯狂的狮子li
abdb1048ed 删除文件 ruoyi-ui 2020-02-13 10:47:14 +08:00
RuoYi
fee8a5955b 若依 2.0 2019-12-02 09:28:11 +08:00
RuoYi
46444bd0fe RuoYi-Vue 1.0 2019-10-08 09:14:38 +08:00