疯狂的狮子li
|
63a582404b
|
update swagger 模板修改为 swagger-bootstrap-ui
|
5 years ago |
|
疯狂的狮子li
|
5494ec36e5
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
ruoyi-ui/src/components/Editor/index.vue
ruoyi-ui/src/permission.js
ruoyi-ui/src/store/modules/user.js
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
|
5 years ago |
RuoYi
|
61432480c8
|
删除多余的代码
|
5 years ago |
|
若依
|
78deee063d
|
!180 富文本编辑组件支持只读
Merge pull request !180 from JOSWAY/master
|
5 years ago |
|
若依
|
616f5a6aca
|
!185 update ruoyi-ui/src/views/monitor/logininfor/index.vue.
Merge pull request !185 from asher/N/A
|
5 years ago |
asher
|
f938a24df0
|
update ruoyi-ui/src/views/monitor/logininfor/index.vue.
|
5 years ago |
|
asher
|
45fa686a64
|
update ruoyi-ui/src/views/monitor/operlog/index.vue.
|
5 years ago |
|
疯狂的狮子li
|
0638f3c1fe
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-ui/src/views/index.vue
|
5 years ago |
|
RuoYi
|
64e807f27b
|
添加新群号：186866453
|
5 years ago |
Josway
|
339b932a3d
|
富文本编辑组件支持只读
|
5 years ago |
|
疯狂的狮子li
|
ac99fddfe6
|
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/views/index.vue
|
5 years ago |
|
RuoYi
|
0b5c7f4c96
|
若依 3.4.0
|
5 years ago |
|
疯狂的狮子li
|
2c40a892f8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/system/role/index.vue
|
5 years ago |
|
RuoYi
|
3a51c53823
|
角色非自定义权限范围清空选择值
|
5 years ago |
|
RuoYi
|
df504c5c14
|
修复四级菜单无法显示问题
|
5 years ago |
|
疯狂的狮子li
|
6f0dfa850a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/system/role/index.vue
|
5 years ago |
|
RuoYi
|
baeed2e8d3
|
修复角色管理-编辑角色-功能权限显示异常
|
5 years ago |
|
疯狂的狮子li
|
2925f28255
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
|
5 years ago |
|
RuoYi
|
2903de1561
|
升级element-ui到最新版本2.15.0
|
5 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
|
5 years ago |
|
RuoYi
|
14a859899c
|
代码生成模板支持主子表
|
5 years ago |
|
RuoYi
|
7d0eb3b8c7
|
用户显隐列添加不同key防止被复用
|
5 years ago |
|
RuoYi
|
654aa6b30c
|
表格右侧工具栏组件支持显隐列
|
5 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
|
5 years ago |
|
RuoYi
|
edd090a098
|
代码生成支持文件上传组件
|
5 years ago |
|
RuoYi
|
3cd886785b
|
图片组件添加预览功能
|
5 years ago |
|
RuoYi
|
ae5a0f9774
|
新增文件上传组件
|
5 years ago |
|
RuoYi
|
a118738d0f
|
单图上传组件添加移除
|
5 years ago |
|
RuoYi
|
56fa3912ae
|
修复IE11浏览器报错问题
|
5 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
|
5 years ago |
|
RuoYi
|
2116ee1822
|
Update copyright
|
5 years ago |
|
RuoYi
|
57a2eb4217
|
操作按钮组调整为朴素按钮样式
|
5 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
|
5 years ago |
|
RuoYi
|
a9c6ba12e6
|
代码生成日期控件区分范围
|
5 years ago |
|
RuoYi
|
ba068eae65
|
修正侧边栏静态路由丢失问题
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
若依
|
1a87ee7c19
|
防止get请求参数值为false或0等特殊值会导致无法正确的传参
Merge pull request !146 from wugh/hotfix/gitee-issue_I2A5FU
|
5 years ago |
DokiYoloo
|
3c4b01ab83
|
权限工具类增加admin判断
|
5 years ago |
wugh
|
886ce995af
|
[bug修复] 解决get请求,如果参数值为false或0等特殊值会导致无法正确传参
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
52264b6e2a
|
优化多级菜单之间切换无法缓存的问题
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
c86dc20743
|
移除path-to-regexp正则匹配插件
|
5 years ago |
|
RuoYi
|
ecc7a8be46
|
优化多级菜单之间切换无法缓存的问题
|
5 years ago |
|
疯狂的狮子li
|
1249c7ca26
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/permission.js
ruoyi-ui/src/views/login.vue
|
5 years ago |
|
RuoYi
|
4f33da2a3f
|
登录后push添加catch防止出现检查错误
|
5 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
|
5 years ago |
|
RuoYi
|
8988d0b4ab
|
若依 3.3.0
|
5 years ago |
|
RuoYi
|
ceefa20aa2
|
调整代码生成页列宽
|
5 years ago |
|
RuoYi
|
ecfe7006e2
|
代码生成预览支持高亮显示
|
5 years ago |
