疯狂的狮子li
|
cd312f1348
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/index.vue
ruoyi-ui/src/store/modules/app.js
ruoyi-ui/src/store/modules/permission.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/online/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/importTable.vue
|
2022-03-15 10:20:53 +08:00 |
|
RuoYi
|
6130bebbb3
|
开启TopNav没有子菜单情况隐藏侧边栏
|
2022-03-06 09:03:44 +08:00 |
|
RuoYi
|
cb8f5de5af
|
修复表单清除元素位置未垂直居中问题(I4V27B)
|
2022-03-04 19:24:28 +08:00 |
|
疯狂的狮子li
|
b9afd55856
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
ruoyi-ui/src/components/FileUpload/index.vue
ruoyi-ui/src/components/ImageUpload/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2022-02-28 12:16:18 +08:00 |
|
RuoYi
|
927b05713a
|
组件fileUpload支持多文件同时选择上传
|
2022-02-25 11:51:29 +08:00 |
|
疯狂的狮子li
|
568e2a9337
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/src/components/Pagination/index.vue
ruoyi-ui/src/permission.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
2022-02-24 15:30:20 +08:00 |
|
RuoYi
|
bb65cd1976
|
代码生成子表支持日期/字典配置
|
2022-02-24 09:28:51 +08:00 |
|
疯狂的狮子li
|
1c7d840ff6
|
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/controller/system/SysUserController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2022-01-04 09:45:33 +08:00 |
|
RuoYi
|
d51e7cbb51
|
用户管理部门查询选择节点后分页参数初始
|
2021-12-29 11:04:09 +08:00 |
|
疯狂的狮子li
|
d2c6e27d07
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/views/system/user/index.vue
|
2021-12-16 14:21:04 +08:00 |
|
RuoYi
|
06aef0587a
|
用户导入提示溢出则显示滚动条
|
2021-12-16 09:50:26 +08:00 |
|
疯狂的狮子li
|
29c46a15f9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/directive/index.js
ruoyi-ui/src/plugins/download.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/system/user/authRole.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
|
2021-12-13 12:37:36 +08:00 |
|
RuoYi
|
a2d3f987c0
|
优化代码
|
2021-11-30 11:15:17 +08:00 |
|
疯狂的狮子li
|
af25588b88
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
# ruoyi-generator/pom.xml
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
# ruoyi-generator/src/main/resources/vm/js/api.js.vm
# ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
# ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
# ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
# ruoyi-ui/package.json
# ruoyi-ui/src/api/monitor/server.js
# ruoyi-ui/src/components/RuoYi/Doc/index.vue
# ruoyi-ui/src/components/RuoYi/Git/index.vue
# ruoyi-ui/src/components/SizeSelect/index.vue
# ruoyi-ui/src/layout/components/Sidebar/Logo.vue
# ruoyi-ui/src/layout/components/TagsView/index.vue
# ruoyi-ui/src/layout/index.vue
# ruoyi-ui/src/main.js
# ruoyi-ui/src/plugins/download.js
# ruoyi-ui/src/router/index.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/store/modules/user.js
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/monitor/job/log.vue
# ruoyi-ui/src/views/system/dict/data.vue
# ruoyi-ui/src/views/system/role/index.vue
# ruoyi-ui/src/views/system/user/authRole.vue
# ruoyi-ui/src/views/system/user/index.vue
# ruoyi-ui/src/views/system/user/profile/resetPwd.vue
# ruoyi-ui/src/views/system/user/profile/userAvatar.vue
# ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
2021-11-25 19:39:53 +08:00 |
|
RuoYi
|
ef4bfde4a8
|
优化提示信息
|
2021-11-22 18:06:44 +08:00 |
|
疯狂的狮子li
|
64add90edd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-ui/package.json
ruoyi-ui/src/api/monitor/logininfor.js
ruoyi-ui/src/api/monitor/operlog.js
ruoyi-ui/src/api/system/config.js
ruoyi-ui/src/api/system/dict/data.js
ruoyi-ui/src/api/system/dict/type.js
ruoyi-ui/src/api/system/post.js
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/request.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
|
2021-11-17 19:14:03 +08:00 |
|
RuoYi
|
cedd2d1daf
|
优化导出数据操作
|
2021-11-17 11:57:17 +08:00 |
|
疯狂的狮子li
|
99dcbe0207
|
update 封装通用下载方法简化下载使用
|
2021-09-27 17:24:37 +08:00 |
|
RuoYi
|
ded99502ae
|
新增通用方法简化下载使用
|
2021-09-27 10:38:29 +08:00 |
|
疯狂的狮子li
|
03b31652a2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/Settings/index.vue
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/online/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/monitor/server/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/authRole.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
ruoyi-ui/src/views/tool/gen/importTable.vue
|
2021-09-23 18:53:17 +08:00 |
|
RuoYi
|
258335cc65
|
新增通用方法简化模态/缓存使用
|
2021-09-23 09:38:16 +08:00 |
|
疯狂的狮子li
|
2f18d0d709
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/main.js
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-09-18 16:01:52 +08:00 |
|
RuoYi
|
12ab8b03d9
|
使用vue-data-dict，简化数据字典使用
|
2021-09-17 15:36:54 +08:00 |
|
疯狂的狮子li
|
80784433b8
|
remove 移除分页合理化参数 使用 MP 全局配置分页溢出
|
2021-09-02 15:59:42 +08:00 |
|
RuoYi
|
a15bfdfb46
|
防止表格最后页最后项删除变成暂无数据
|
2021-09-02 10:55:10 +08:00 |
|
疯狂的狮子li
|
1a695159e3
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
ruoyi-ui/src/api/login.js
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/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
|
2021-09-02 10:49:56 +08:00 |
|
RuoYi
|
ee823b8326
|
防止表格最后页最后项删除变成暂无数据
|
2021-09-02 10:19:04 +08:00 |
|
疯狂的狮子li
|
f91ebd93d2
|
update 重构 将下载excel工具提取到全局
|
2021-08-23 18:28:33 +08:00 |
|
疯狂的狮子li
|
9cf4794146
|
update 更新 SysUser 导入导出
|
2021-08-04 18:29:38 +08:00 |
|
疯狂的狮子li
|
cfdeada3fd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/i18n/messages.properties
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/java/service.java.vm
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/src/api/login.js
ruoyi-ui/src/router/index.js
ruoyi-ui/src/utils/zipdownload.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-08-02 11:21:09 +08:00 |
|
RuoYi
|
5397e345ca
|
新增是否开启用户注册功能
|
2021-07-30 21:23:35 +08:00 |
|
疯狂的狮子li
|
06944747fd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-07-27 12:42:41 +08:00 |
|
RuoYi
|
6a5c86541a
|
跳转路由高亮相对应的菜单栏
|
2021-07-27 11:54:20 +08:00 |
|
RuoYi
|
97ae0eb7c7
|
密码框新增显示切换密码图标
|
2021-07-25 19:13:56 +08:00 |
|
RuoYi
|
6c1cccd031
|
导入用户样式调整
|
2021-07-25 19:08:00 +08:00 |
|
RuoYi
|
0a516e3001
|
更多操作按钮添加权限控制
|
2021-07-25 10:20:52 +08:00 |
|
疯狂的狮子li
|
aa14085746
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-07-06 12:01:05 +08:00 |
|
RuoYi
|
ce6bea4ba0
|
限制超级管理员不允许操作
|
2021-07-05 09:57:15 +08:00 |
|
RuoYi
|
9c7901f526
|
用户管理新增分配角色功能
|
2021-07-01 18:01:36 +08:00 |
|
疯狂的狮子li
|
d05458aa3a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/main.js
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
2021-06-23 09:38:53 +08:00 |
|
RuoYi
|
1ed60c79c0
|
用户信息长度校验限制
|
2021-06-22 20:45:19 +08:00 |
|
疯狂的狮子li
|
a8c1d02ee1
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/.env.development
ruoyi-ui/.env.production
ruoyi-ui/.env.staging
ruoyi-ui/package.json
ruoyi-ui/src/App.vue
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/Pagination/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/permission.js
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/vue.config.js
|
2021-06-17 18:15:34 +08:00 |
|
RuoYi
|
ea66e20282
|
修复用户搜索分页变量错误
|
2021-06-10 22:36:22 +08:00 |
|
疯狂的狮子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
|
6c195af2a3
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-generator/pom.xml
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/public/index.html
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.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/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
|
2021-05-25 10:00:36 +08:00 |
|
疯狂的狮子li
|
7076deb2b6
|
update 请求响应对象 与 分页对象 结构修改 适配接口文档配置
|
2021-05-20 13:23:12 +08:00 |
|
RuoYi
|
b431703262
|
导出按钮点击之后添加遮罩
|
2021-05-17 15:37:58 +08:00 |
|
疯狂的狮子li
|
684eadbcc6
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/java/domain.java.vm
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/index.vue
sql/ry_20210108.sql
|
2021-01-11 09:58:41 +08:00 |
|
RuoYi
|
7d0eb3b8c7
|
用户显隐列添加不同key防止被复用
|
2021-01-07 13:28:16 +08:00 |
|