83 Commits

Author	SHA1	Message	Date
疯狂的狮子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	59114a14ff	update 同步 ruoyi 对新业务进行修正	2021-07-06 13:05:47 +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	06e9feadee	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-ui/src/views/system/user/profile/userAvatar.vue	2021-03-26 14:07:53 +08:00
RuoYi	090e258bf9	显隐列初始默认隐藏列	2021-03-24 15:46:37 +08:00
若依	505fa06dc3	!192 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. ... Merge pull request !192 from 谢凯/N/A	2021-03-24 15:32:24 +08:00
谢凯	881dc3fcf0	update ruoyi-ui/src/views/system/user/profile/userAvatar.vue.	2021-03-22 17:52:34 +08:00
allworldg	b65c8d4512	update ruoyi-ui/src/views/system/user/profile/userAvatar.vue.	2021-03-21 21:20:23 +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
RuoYi	654aa6b30c	表格右侧工具栏组件支持显隐列	2021-01-06 17:30:39 +08:00
疯狂的狮子li	d73994f05d	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-admin/src/main/resources/application.yml ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-ui/src/layout/components/TagsView/index.vue ruoyi-ui/src/views/login.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	2021-01-05 09:22:36 +08:00
RuoYi	57a2eb4217	操作按钮组调整为朴素按钮样式	2021-01-04 17:48:46 +08:00
疯狂的狮子li	6c8497f632	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-ui/package.json ruoyi-ui/src/components/Breadcrumb/index.vue ruoyi-ui/src/layout/components/AppMain.vue ruoyi-ui/src/layout/components/Sidebar/index.vue ruoyi-ui/src/layout/components/TagsView/index.vue ruoyi-ui/src/store/getters.js ruoyi-ui/src/store/modules/permission.js ruoyi-ui/src/views/system/user/profile/resetPwd.vue ruoyi-ui/src/views/system/user/profile/userInfo.vue ruoyi-ui/src/views/tool/gen/editTable.vue	2020-12-18 09:45:54 +08:00
RuoYi	ecc7a8be46	优化多级菜单之间切换无法缓存的问题	2020-12-16 20:57:48 +08:00
疯狂的狮子li	f56f57a236	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.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/SysRoleMenuMapper.xml ruoyi-ui/package.json ruoyi-ui/src/assets/styles/ruoyi.scss ruoyi-ui/src/assets/styles/sidebar.scss ruoyi-ui/src/assets/styles/variables.scss ruoyi-ui/src/components/HeaderSearch/index.vue ruoyi-ui/src/components/Screenfull/index.vue ruoyi-ui/src/layout/components/Settings/index.vue ruoyi-ui/src/layout/components/Sidebar/Logo.vue ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue ruoyi-ui/src/layout/components/Sidebar/index.vue ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue ruoyi-ui/src/layout/index.vue ruoyi-ui/src/main.js ruoyi-ui/src/settings.js ruoyi-ui/src/store/modules/settings.js ruoyi-ui/src/store/modules/user.js ruoyi-ui/src/views/login.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/userInfo.vue ruoyi-ui/src/views/tool/gen/editTable.vue ruoyi-ui/src/views/tool/gen/index.vue ruoyi-ui/vue.config.js	2020-12-11 14:27:54 +08:00
RuoYi	9e387dc447	去除用户手机邮箱部门必填验证	2020-12-11 13:26:14 +08:00
RuoYi	fbc071a573	关闭页签清理缓存数据	2020-12-08 16:43:26 +08:00
疯狂的狮子li	69f30760f8	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-ui/src/assets/styles/ruoyi.scss ruoyi-ui/src/utils/request.js ruoyi-ui/src/views/system/user/profile/userAvatar.vue	2020-12-07 12:59:35 +08:00
RuoYi	7e78a9167f	修改用户头像预览宽高	2020-12-06 16:22:45 +08:00
疯狂的狮子li	ce438f182a	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java ruoyi-ui/package.json ruoyi-ui/src/layout/components/AppMain.vue ruoyi-ui/src/layout/components/TagsView/index.vue ruoyi-ui/src/router/index.js ruoyi-ui/src/store/modules/permission.js ruoyi-ui/src/views/system/user/profile/userAvatar.vue sql/ry_20201128.sql	2020-11-30 12:41:39 +08:00
RuoYi	1147ea5f8a	设置用户头像悬停高度	2020-11-30 11:10:27 +08:00
疯狂的狮子li	20d7c90515	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java ruoyi-ui/src/views/system/user/profile/userAvatar.vue sql/ry_20201123.sql	2020-11-24 10:03:59 +08:00
RuoYi	5b63f0cab9	优化头像样式，鼠标移入悬停遮罩	2020-11-19 09:33:10 +08:00
疯狂的狮子li	efb938c370	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java ruoyi-ui/src/views/system/notice/index.vue ruoyi-ui/src/views/system/user/index.vue	2020-11-03 09:56:18 +08:00
FlyFive	212012dc62	未选择时，点击“确认”，出现必填验证提示。使用blur的话，选择之后验证消息不会自动消失，使用change会自动消失。	2020-11-02 11:49:25 +08:00
疯狂的狮子li	8ca53c7666	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-generator/src/main/resources/vm/vue/index.vue.vm 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/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/index.vue	2020-10-12 09:54:59 +08:00
RuoYi	b0965653bf	删除不必要的代码	2020-10-10 17:54:30 +08:00
疯狂的狮子li	cddaf4b088	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-ui/src/layout/components/TagsView/index.vue ruoyi-ui/src/views/system/user/index.vue	2020-10-07 12:25:38 +08:00
RuoYi	c19fec2cf8	格式化代码	2020-10-03 20:05:06 +08:00
疯狂的狮子li	aefa2095f0	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java ruoyi-generator/src/main/resources/vm/sql/sql.vm ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java 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/service/impl/SysDeptServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.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/SysRoleMapper.xml ruoyi-ui/src/assets/styles/ruoyi.scss ruoyi-ui/src/router/index.js ruoyi-ui/src/views/system/menu/index.vue ruoyi-ui/src/views/system/role/index.vue ruoyi-ui/src/views/system/user/index.vue sql/ry_20200920.sql	2020-09-22 13:22:30 +08:00
RuoYi	478fae0d28	菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）	2020-09-19 13:42:37 +08:00
疯狂的狮子li	298fabfdec	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue ... Conflicts: ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.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/resources/mapper/generator/GenTableColumnMapper.xml ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml ruoyi-ui/src/api/tool/gen.js ruoyi-ui/src/assets/styles/ruoyi.scss ruoyi-ui/src/views/system/user/index.vue ruoyi-ui/src/views/tool/gen/index.vue	2020-09-18 17:38:23 +08:00