RuoYi
|
ce54416e4f
|
升级fastjson到最新版1.2.75
|
2021-01-13 16:20:39 +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 |
若依
|
f3cb18c836
|
!161 修复导入数据为负浮点数时,导入结果会丢失精度问题
Merge pull request !161 from 嘿白熊/master
|
2021-01-08 10:46:36 +08:00 |
RuoYi
|
7d0eb3b8c7
|
用户显隐列添加不同key防止被复用
|
2021-01-07 13:28:16 +08:00 |
RuoYi
|
654aa6b30c
|
表格右侧工具栏组件支持显隐列
|
2021-01-06 17:30:39 +08:00 |
X.B-H
|
b7cdd10f9f
|
修复导入数据为负浮点数时丢失精度问题
|
2021-01-06 11:11:11 +08:00 |
RuoYi
|
9bd35cb7be
|
升级druid到最新版本v1.2.4
|
2021-01-06 11:00:20 +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
|
3cd886785b
|
图片组件添加预览功能
|
2021-01-05 20:33:41 +08:00 |
RuoYi
|
ae5a0f9774
|
新增文件上传组件
|
2021-01-05 20:11:09 +08:00 |
RuoYi
|
074b3c735d
|
设置单图上传控件
|
2021-01-05 16:17:41 +08:00 |
RuoYi
|
a118738d0f
|
单图上传组件添加移除
|
2021-01-05 16:13:22 +08:00 |
RuoYi
|
56fa3912ae
|
修复IE11浏览器报错问题
|
2021-01-05 09:44:08 +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
|
2116ee1822
|
Update copyright
|
2021-01-04 17:49:52 +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
|
647af5b485
|
菜单组件修改允许空字符串
|
2020-12-29 17:27:48 +08:00 |
若依
|
3f33219134
|
!156 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空
Merge pull request !156 from li_oxen/N/A
|
2020-12-29 17:14:31 +08:00 |
li_oxen
|
a04bb71777
|
修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空
|
2020-12-29 13:51:15 +08:00 |
RuoYi
|
63992ac906
|
代码生成数据库文本类型生成表单文本域
|
2020-12-29 11:14:48 +08:00 |
疯狂的狮子li
|
b8f6731584
|
增加 demo模块 方便参考扩展
|
2020-12-29 10:17:44 +08:00 |
疯狂的狮子li
|
93e7f53cf8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-28 10:40:13 +08:00 |
RuoYi
|
0187344798
|
Excel注解支持Image图片导出
|
2020-12-27 10:04:45 +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 |
RuoYi
|
ba068eae65
|
修正侧边栏静态路由丢失问题
|
2020-12-24 19:32:18 +08:00 |
疯狂的狮子li
|
476df3117b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/utils/permission.js
ruoyi-ui/src/utils/request.js
|
2020-12-24 10:04:54 +08:00 |
若依
|
1a87ee7c19
|
防止get请求参数值为false或0等特殊值会导致无法正确的传参
Merge pull request !146 from wugh/hotfix/gitee-issue_I2A5FU
|
2020-12-22 16:19:51 +08:00 |
DokiYoloo
|
3c4b01ab83
|
权限工具类增加admin判断
|
2020-12-21 19:43:57 +08:00 |
疯狂的狮子li
|
1000a577d0
|
配置文件新增redis数据库索引属性
|
2020-12-21 11:58:49 +08:00 |
wugh
|
886ce995af
|
[bug修复] 解决get请求,如果参数值为false或0等特殊值会导致无法正确传参
|
2020-12-21 11:58:15 +08:00 |
疯狂的狮子li
|
78ef398257
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/src/store/modules/permission.js
|
2020-12-21 11:55:32 +08:00 |
RuoYi
|
52264b6e2a
|
优化多级菜单之间切换无法缓存的问题
|
2020-12-21 10:50:48 +08:00 |
RuoYi
|
fd7e88a518
|
配置文件新增redis数据库索引属性
|
2020-12-21 10:26:54 +08:00 |
若依
|
854a6f805f
|
!145 redis 增加 database配置项,设置不同的库
Merge pull request !145 from li_oxen/N/A
|
2020-12-21 10:13:47 +08:00 |
li_oxen
|
1caec85f46
|
redis 增加 database配置项,设置不同的库
|
2020-12-19 10:08:09 +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
|
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 |
疯狂的狮子li
|
b029a7265a
|
将controller条件查询器改完隐式泛型
|
2020-12-18 00:02:40 +08:00 |
RuoYi
|
c86dc20743
|
移除path-to-regexp正则匹配插件
|
2020-12-17 12:05:29 +08:00 |
RuoYi
|
ecc7a8be46
|
优化多级菜单之间切换无法缓存的问题
|
2020-12-16 20:57:48 +08:00 |
疯狂的狮子li
|
f44ff8477f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
|
2020-12-16 12:44:21 +08:00 |