疯狂的狮子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
|
7d0eb3b8c7
|
用户显隐列添加不同key防止被复用
|
4 years ago |
RuoYi
|
654aa6b30c
|
表格右侧工具栏组件支持显隐列
|
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
|
3cd886785b
|
图片组件添加预览功能
|
4 years ago |
RuoYi
|
ae5a0f9774
|
新增文件上传组件
|
4 years ago |
RuoYi
|
a118738d0f
|
单图上传组件添加移除
|
4 years ago |
RuoYi
|
56fa3912ae
|
修复IE11浏览器报错问题
|
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
|
2116ee1822
|
Update copyright
|
4 years ago |
RuoYi
|
57a2eb4217
|
操作按钮组调整为朴素按钮样式
|
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 |
RuoYi
|
ba068eae65
|
修正侧边栏静态路由丢失问题
|
4 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
|
4 years ago |
若依
|
1a87ee7c19
|
防止get请求参数值为false或0等特殊值会导致无法正确的传参
Merge pull request !146 from wugh/hotfix/gitee-issue_I2A5FU
|
4 years ago |
DokiYoloo
|
3c4b01ab83
|
权限工具类增加admin判断
|
4 years ago |
wugh
|
886ce995af
|
[bug修复] 解决get请求,如果参数值为false或0等特殊值会导致无法正确传参
|
4 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
|
4 years ago |
RuoYi
|
52264b6e2a
|
优化多级菜单之间切换无法缓存的问题
|
4 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
|
4 years ago |
RuoYi
|
c86dc20743
|
移除path-to-regexp正则匹配插件
|
4 years ago |
RuoYi
|
ecc7a8be46
|
优化多级菜单之间切换无法缓存的问题
|
4 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
|
4 years ago |
RuoYi
|
4f33da2a3f
|
登录后push添加catch防止出现检查错误
|
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 |
RuoYi
|
ceefa20aa2
|
调整代码生成页列宽
|
4 years ago |
RuoYi
|
ecfe7006e2
|
代码生成预览支持高亮显示
|
4 years ago |
疯狂的狮子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
|
4 years ago |
RuoYi
|
9e387dc447
|
去除用户手机邮箱部门必填验证
|
4 years ago |
RuoYi
|
d6eac2dc8d
|
前端更新插件版本
|
4 years ago |
RuoYi
|
b368ad764f
|
升级core-js到最新版本3.8.1
|
4 years ago |
RuoYi
|
ffd5f0ce5d
|
升级vue-router到最新版本3.4.9
|
4 years ago |
RuoYi
|
a50beae599
|
代码生成预览提供滚动机制
|
4 years ago |
RuoYi
|
4d46f4c1b5
|
删除用户和角色解绑关联
|
4 years ago |
〝走走停停
|
d6b6151aea
|
update ruoyi-ui/src/assets/styles/ruoyi.scss.
|
4 years ago |
RuoYi
|
fbc071a573
|
关闭页签清理缓存数据
|
4 years ago |
RuoYi
|
6cfff90b4a
|
缓存仪表图设置默认大小
|
4 years ago |
RuoYi
|
f90899d72a
|
支持主题风格配置
|
4 years ago |
疯狂的狮子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
|
4 years ago |
RuoYi
|
7e78a9167f
|
修改用户头像预览宽高
|
4 years ago |
RuoYi
|
563e11d9c1
|
get请求params添加null值判断
|
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
|
5ebd0a971f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
4 years ago |
RuoYi
|
23868c4fad
|
防止安全扫描YUI出现的风险提示
|
4 years ago |
疯狂的狮子li
|
b36b413a69
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
4 years ago |