疯狂的狮子li
|
2103731f10
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/notice/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/gen/index.vue
ruoyi-ui/src/views/tool/swagger/index.vue
|
2021-06-10 09:44:56 +08:00 |
|
RuoYi
|
19924cd184
|
修复关闭confirm提示框控制台报错问题
|
2021-06-03 13:24:29 +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
|
cc50224d90
|
固定顶部导航栏&窗口大小改变实时更新栏数
|
2021-04-14 11:01:16 +08:00 |
|
RuoYi
|
9aac65ff32
|
新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）
|
2021-04-12 09:54:08 +08:00 |
|
疯狂的狮子li
|
a3a3d62034
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/views/system/role/index.vue
|
2020-07-13 09:27:49 +08:00 |
|
RuoYi
|
a691da0c97
|
防止切换权限用户后登录出现404
|
2020-07-10 16:36:25 +08:00 |
|
疯狂的狮子li
|
4bee0d652a
|
修复前端页面报错 找不到模块问题
|
2020-04-25 20:09:39 +08:00 |
|
疯狂的狮子li
|
31a2713012
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
ruoyi-ui/src/api/login.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/tool/build/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
|
2020-04-03 10:16:28 +08:00 |
|
RuoYi
|
992a63482c
|
布局设置点击扩大范围
|
2020-04-01 11:35:58 +08:00 |
|
疯狂的狮子li
|
2e6bb454f4
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/bin/package.bat
ruoyi-ui/package.json
ruoyi-ui/src/assets/styles/element-ui.scss
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/components/icons/element-icons.js
ruoyi-ui/src/views/dashboard/mixins/resize.js
ruoyi-ui/src/views/system/menu/index.vue
ruoyi/src/main/java/com/ruoyi/common/filter/XssFilter.java
ruoyi/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi/src/main/java/com/ruoyi/common/utils/text/CharsetKit.java
ruoyi/src/main/java/com/ruoyi/common/utils/text/Convert.java
ruoyi/src/main/java/com/ruoyi/common/utils/text/StrFormatter.java
ruoyi/src/main/java/com/ruoyi/framework/config/FilterConfig.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
|
2020-03-16 09:58:40 +08:00 |
|
RuoYi
|
3b87128461
|
修复点击退出登录有时会无效问题
|
2020-03-15 20:13:33 +08:00 |
|
疯狂的狮子li
|
6687efd887
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
ruoyi-ui/src/components/RuoYi/Git/index.vue
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/index.js
ruoyi-ui/src/utils/permission.js
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/tool/build/index.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi/pom.xml
ruoyi/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
ruoyi/src/main/resources/application.yml
ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml
ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
ruoyi/src/main/resources/vm/java/controller.java.vm
ruoyi/src/main/resources/vm/java/domain.java.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
2020-02-24 09:56:22 +08:00 |
|
RuoYi
|
cb0a4b78ee
|
若依 2.1
|
2020-02-24 09:28:16 +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
|
46444bd0fe
|
RuoYi-Vue 1.0
|
2019-10-08 09:14:38 +08:00 |
|