wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,351 Commits 2 Branches 0 Tags 6 MiB
Commit Graph

169 Commits

Author SHA1 Message Date
朱杰 798ffd9065 fix 修复代码生成器中表字段取消必填无法更新问题 2021-05-22 23:29:15 +08:00
刘立伟 d0a4d6b111 修正注释 2021-05-18 10:21:48 +08:00
疯狂的狮子li dab99405c5 update springboot 升级 2.3.10 依赖全面升级适配 2021-05-14 16:58:09 +08:00
疯狂的狮子li d2c745d3fd add 代码生成器 增加校验注解 2021-05-14 15:12:40 +08:00
疯狂的狮子li 6067cb1797 add 增加增强Mapper 重写业务适配 2021-05-14 13:01:18 +08:00
疯狂的狮子li 0c7e52d9c3 update 代码生成器修改为MP分页(完成) 2021-05-14 10:44:04 +08:00
疯狂的狮子li 81b50b9b3c update 代码生成器修改为MP分页(未完成) 2021-05-13 23:52:36 +08:00
疯狂的狮子li 7f73591742 fix 修复代码生成 数据权限问题 2021-05-13 22:43:14 +08:00
疯狂的狮子li f01bb5966a update 使用 MP 分页工具 重构业务 2021-05-13 21:25:51 +08:00
疯狂的狮子li c33c3de43a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	README.md
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-ui/src/assets/styles/element-ui.scss
	ruoyi-ui/src/views/index.vue
 2021-05-11 17:14:53 +08:00
RuoYi 99726be9ac 修正导入表权限标识 2021-05-11 14:26:20 +08:00
疯狂的狮子li 1bef814c51 update 补全实体类 注入注解 2021-04-22 21:07:18 +08:00
疯狂的狮子li a4f2aa1981 fix 代码生成器编辑问题 2021-04-19 19:01:26 +08:00
疯狂的狮子li 97873a7b2b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/store/modules/settings.js
 2021-04-19 17:43:32 +08:00
RuoYi cb18eec802 修正模板字符编码 2021-04-18 15:45:49 +08:00
疯狂的狮子li bf5315d306 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 2021-04-16 11:34:39 +08:00
Ricky de73cf300b 优化树表代码生成模板 2021-04-15 10:39:09 +08:00
Ricky cbcee86d2c 优化树表代码生成模板 2021-04-15 10:37:22 +08:00
疯狂的狮子li 927777291e update 导出 Excel 工作表的名称修改 2021-04-14 14:36:27 +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
疯狂的狮子li adeaa77864 update mp化 2021-04-14 12:01:26 +08:00
RuoYi fe2ccbdc1b 优化代码生成导出模板名称 2021-04-13 14:49:42 +08:00
疯狂的狮子li d69d1fbfe8 update 更新任务调度模块 与 代码生成模块 MP lombok 化 2021-04-12 17:49:56 +08:00
lihy2021 6595c68df1 导出 Excel 工作表的名称 由 ${businessName} 更改为 ${functionName} 2021-04-12 14:52:14 +08:00
Ricky 5a2a0c09b6 优化主子表代码生成 2021-04-12 13:26:54 +08:00
疯狂的狮子li d48946ab90 fix bo缺包问题 2021-04-12 10:34:50 +08:00
疯狂的狮子li 88841ac01f update Date参数接收Bo实体格式转换 2021-04-09 11:47:51 +08:00
疯狂的狮子li c862484f00 update 默认增加editBo主键生成 2021-04-08 16:29:35 +08:00
疯狂的狮子li ccd48965a8 fix controller 接口路径问题 2021-04-04 20:01:36 +08:00
疯狂的狮子li b6472f3469 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-04-04 11:27:42 +08:00
疯狂的狮子li 866c69e706 fix 代码生成器问题 2021-04-04 11:27:08 +08:00
疯狂的狮子li a50df84a72 fix 生成 remove 方法参数类型错误 2021-04-03 17:00:47 +08:00
疯狂的狮子li 6760942218 fix Page 路径导入 2021-04-02 23:05:44 +08:00
疯狂的狮子li dfcd84c2bc fix 数据权限语句null bug 2021-04-02 15:44:02 +08:00
疯狂的狮子li 85e9534fae add 增加数据权限注入 2021-04-02 14:15:10 +08:00
疯狂的狮子li 4a1ff5a5ac update 修改controller生成模板 规范代码结构 2021-04-01 17:57:54 +08:00
疯狂的狮子li 222dfd1fe1 update 修改xml生成模板 附加domain类路径 2021-04-01 17:57:24 +08:00
疯狂的狮子li c1964b934f update 简化queryById代码生成器 2021-03-31 16:51:24 +08:00
疯狂的狮子li 77ffdf69a1 fix 修复 vo转换 分页bug 2021-03-25 17:01:17 +08:00
疯狂的狮子li e3bcc6b273 fix 查询类模板缺少导入包 2021-03-25 17:00:40 +08:00
疯狂的狮子li f156e0a094 update pr优化 2021-03-22 13:32:20 +08:00
疯狂的狮子li 62464cfe45 fix Collection 验证失效问题 2021-03-22 13:31:43 +08:00
疯狂的狮子li 7d47e1e81b fix 表名转换问题 2021-03-22 13:30:59 +08:00
wugh 3d6fbb93f5 !11 [功能] 拆分出Vo,QueryBo,AddBo,EditBo等领域对象 
* [修改] 错误引入的无用导包删除
* [新增] 增加Vo,QueryBo,AddBo,EditBo等视图,并调整controller,service的调用代码
* [新增] 增加CreateAndUpdateMetaObjectHandler,配合fill注解,实现创建和修改人的自动设置,减少重复代码
 2021-03-22 09:32:49 +08:00
疯狂的狮子li 9b4b9e0c74 update 删除通用工具 改为使用hutool 2021-03-15 16:38:43 +08:00
疯狂的狮子li 8ba1266b6a 修改 页面生成模板 适配后端时间格式 2021-01-28 09:22:25 +08:00
疯狂的狮子li 9fdee373af 删除多余注解(@Data已包含) 2021-01-18 14:00:03 +08:00
疯狂的狮子li 52325307f4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	README.md
 2021-01-15 15:08:50 +08:00
RuoYi bd19892aff 修复生成树表代码异常 2021-01-13 16:19: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 14a859899c 代码生成模板支持主子表 2021-01-08 10:47:36 +08:00
RuoYi 7a86c714fc 代码生成支持文件上传组件 2021-01-06 11:00:09 +08:00
疯狂的狮子li b368745380 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/util/GenUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-01-06 09:35:00 +08:00
RuoYi edd090a098 代码生成支持文件上传组件 2021-01-05 20:59:14 +08:00
RuoYi 074b3c735d 设置单图上传控件 2021-01-05 16:17:41 +08:00
RuoYi a118738d0f 单图上传组件添加移除 2021-01-05 16:13:22 +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 e9d368ed0c 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/util/GenUtils.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
 2020-12-30 16:20:09 +08:00
RuoYi 63992ac906 代码生成数据库文本类型生成表单文本域 2020-12-29 11:14:48 +08:00
疯狂的狮子li c24b912b50 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/store/modules/permission.js
 2020-12-25 09:59:24 +08:00
RuoYi a9c6ba12e6 代码生成日期控件区分范围 2020-12-25 09:35:20 +08:00
疯狂的狮子li 805c79506b 代码生成 后端支持 between 2020-12-18 17:46:05 +08:00
疯狂的狮子li 817da5bc04 修复export与list结果不统一问题 2020-12-18 16:50:58 +08:00
wangxianl a514330db3 修复export与list结果不统一的问题 2020-12-18 15:47:07 +08:00
疯狂的狮子li 2b0cf24be4 修改 controller 生成器 解决where条件重复bug 2020-12-18 09:47:35 +08:00
疯狂的狮子li b029a7265a 将controller条件查询器改完隐式泛型 2020-12-18 00:02:40 +08:00
wangzhijun fe39a7bc7b 模板controller导入；模板vue列表页当有查询条件时报错 2020-12-09 16:16:53 +08:00
疯狂的狮子li e80349c343 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/utils/request.js
 2020-12-04 11:46:29 +08:00
RuoYi ef92ad4d8c 支持get请求映射params参数 2020-12-04 10:52:20 +08:00
疯狂的狮子li ff563c44e2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-11-18 10:41:13 +08:00
RuoYi 823e95667e 代码生成支持上传控件 2020-11-16 16:20:17 +08:00
疯狂的狮子li 93093d9f55 更改 MybatisPlus Lambda查询 改为官方推荐写法 2020-11-05 13:56:49 +08:00
疯狂的狮子li 30d15afd33 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
	ruoyi-generator/src/main/resources/vm/sql/sql.vm
	ruoyi-ui/src/views/login.vue
	sql/ry_20201021.sql
 2020-10-23 17:41:02 +08:00
RuoYi c9f25cb34e 调整sql默认时间 2020-10-21 11:30:37 +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 cb92e41b76 修复生成树结构报错 2020-10-07 12:27:29 +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 abeb8d7fd8 菜单新增是否缓存keep-alive 2020-09-20 10:34:03 +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
RuoYi 0ecf27f8d6 去除多余的空格 2020-09-18 17:09:27 +08:00
RuoYi 9e38c7de2e 代码生成支持同步数据库 2020-09-18 10:24:21 +08:00
疯狂的狮子li b111cbeedd 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/domain/GenTableColumn.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-09-16 09:23:02 +08:00
RuoYi a948affb2d 代码生成支持富文本控件 2020-09-15 15:53:27 +08:00
疯狂的狮子li 1ef17bb582 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.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
 2020-08-31 09:12:13 +08:00
RuoYi dd6640086e 代码生成树模板去掉多余双引号 2020-08-27 17:34:06 +08:00
疯狂的狮子li fdbe943053 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
 2020-08-26 15:30:25 +08:00
RuoYi a4e2339f90 生成页面时不忽略remark属性 2020-08-26 14:24:37 +08:00
疯狂的狮子li 1b82822d15 根据勾选列表是否显示 隐藏主键列 2020-08-19 17:32:34 +08:00
疯狂的狮子li 1cc8bc172b 修改代码生成 删除主键type注解配置 使用全局配置 2020-08-19 17:03:21 +08:00
疯狂的狮子li 5aeac1a8ae Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/utils/ruoyi.js
 2020-08-19 17:01:43 +08:00
RuoYi 549c7ee97a 代码生成添加select必填选项 2020-08-18 18:15:12 +08:00
sunshine 04e294b3e5 代码生成:select的表单验证失效 2020-08-17 12:08:34 +08:00
疯狂的狮子li 3aaff7b776 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/main.js
	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
 2020-08-12 10:16:29 +08:00
RuoYi 74f52677be 表格右侧工具栏组件 2020-08-10 10:12:39 +08:00
疯狂的狮子li 4044ed23ea Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-ui/src/components/Editor/index.vue
 2020-08-10 09:38:28 +08:00
平凡 5b04f388e9 重写表格工具栏右侧添加刷新&显隐查询栏 2020-08-09 11:07:10 +08:00
wanglei c4ee9ea7c8 修复注释错误 2020-08-07 14:26:30 +08:00
疯狂的狮子li c966d9bada Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.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/html/EscapeUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.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/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.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/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/babel.config.js
	ruoyi-ui/package.json
	ruoyi-ui/src/api/tool/gen.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/utils/ruoyi.js
	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/genInfoForm.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js
	sql/ry_20200724.sql
 2020-08-02 18:31:47 +08:00