80 Commits (9fdee373af90a2b5fa548df64a3344d51fbfae8a)

Author SHA1 Message Date
疯狂的狮子li 9fdee373af 删除多余注解(@Data已包含) 4 years ago
疯狂的狮子li 52325307f4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	README.md
4 years ago
RuoYi bd19892aff 修复生成树表代码异常 4 years ago
疯狂的狮子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
4 years ago
RuoYi 14a859899c 代码生成模板支持主子表 4 years ago
RuoYi 7a86c714fc 代码生成支持文件上传组件 4 years ago
疯狂的狮子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
4 years ago
RuoYi edd090a098 代码生成支持文件上传组件 4 years ago
RuoYi 074b3c735d 设置单图上传控件 4 years ago
RuoYi a118738d0f 单图上传组件添加移除 4 years ago
疯狂的狮子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
4 years ago
RuoYi 57a2eb4217 操作按钮组调整为朴素按钮样式 4 years ago
疯狂的狮子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
4 years ago
RuoYi 63992ac906 代码生成数据库文本类型生成表单文本域 4 years ago
疯狂的狮子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
4 years ago
RuoYi a9c6ba12e6 代码生成日期控件区分范围 4 years ago
疯狂的狮子li 805c79506b 代码生成 后端支持 between 4 years ago
疯狂的狮子li 817da5bc04 修复export与list结果不统一问题 4 years ago
wangxianl a514330db3 修复export与list结果不统一的问题 4 years ago
疯狂的狮子li 2b0cf24be4 修改 controller 生成器 解决where条件重复bug 4 years ago
疯狂的狮子li b029a7265a 将controller条件查询器改完隐式泛型 4 years ago
疯狂的狮子li 7e476b941e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
4 years ago
RuoYi 8988d0b4ab 若依 3.3.0 4 years ago
wangzhijun fe39a7bc7b 模板controller导入;模板vue列表页当有查询条件时报错 4 years ago
疯狂的狮子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
4 years ago
RuoYi ef92ad4d8c 支持get请求映射params参数 4 years ago
疯狂的狮子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
4 years ago
RuoYi 8f145bba3a 若依 v3.2.1 4 years ago
RuoYi 823e95667e 代码生成支持上传控件 4 years ago
疯狂的狮子li 93093d9f55 更改 MybatisPlus Lambda查询 改为官方推荐写法 4 years ago
疯狂的狮子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
4 years ago
RuoYi c9f25cb34e 调整sql默认时间 4 years ago
疯狂的狮子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
4 years ago
RuoYi b0965653bf 删除不必要的代码 4 years ago
RuoYi 69256940df 若依 3.2 4 years ago
疯狂的狮子li bd39b971cf Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/package.json
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/monitor/job/index.vue
4 years ago
疯狂的狮子li cb92e41b76 修复生成树结构报错 4 years ago
疯狂的狮子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
4 years ago
RuoYi abeb8d7fd8 菜单新增是否缓存keep-alive 4 years ago
疯狂的狮子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
4 years ago
RuoYi 0ecf27f8d6 去除多余的空格 4 years ago
RuoYi 9e38c7de2e 代码生成支持同步数据库 4 years ago
疯狂的狮子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
4 years ago
RuoYi a948affb2d 代码生成支持富文本控件 4 years ago
疯狂的狮子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
4 years ago
RuoYi dd6640086e 代码生成树模板去掉多余双引号 4 years ago
疯狂的狮子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
4 years ago
RuoYi a4e2339f90 生成页面时不忽略remark属性 4 years ago
疯狂的狮子li 1b82822d15 根据勾选列表是否显示 隐藏主键列 4 years ago
疯狂的狮子li 1cc8bc172b 修改代码生成 删除主键type注解配置 使用全局配置 4 years ago