疯狂的狮子li
|
ea506de048
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/src/directive/index.js
ruoyi-ui/src/directive/permission/hasPermi.js
ruoyi-ui/src/directive/permission/hasRole.js
ruoyi-ui/src/main.js
ruoyi-ui/src/views/system/notice/index.vue
|
5 years ago |
|
疯狂的狮子li
|
43486f2f41
|
update 配置 monitor-admin docker编排
|
5 years ago |
RuoYi
|
5dec58e7f5
|
自定义弹窗拖拽指令
|
5 years ago |
|
RuoYi
|
8321f92d2c
|
全局注册通用组件
|
5 years ago |
|
疯狂的狮子li
|
1c11d7ccc1
|
update 转移 springboot-admin 到扩展模块项目
|
5 years ago |
|
疯狂的狮子li
|
821f54f1ab
|
update 富文本接口返回值修正
|
5 years ago |
|
疯狂的狮子li
|
e30079d656
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/components/FileUpload/index.vue
ruoyi-ui/src/components/ImageUpload/index.vue
|
5 years ago |
|
RuoYi
|
f56da498ab
|
ImageUpload组件支持多图片上传
|
5 years ago |
|
RuoYi
|
e259093e01
|
文件上传组件添加数量限制属性
|
5 years ago |
|
RuoYi
|
e963a86b15
|
富文本编辑组件添加类型属性
|
5 years ago |
|
RuoYi
|
e447fb806b
|
FileUpload组件支持多文件上传
|
5 years ago |
|
疯狂的狮子li
|
59114a14ff
|
update 同步 ruoyi 对新业务进行修正
|
5 years ago |
|
疯狂的狮子li
|
aa14085746
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.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/SysUserMapper.xml
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
5 years ago |
|
疯狂的狮子li
|
2fc3dcfc74
|
update 更改演示案例
|
5 years ago |
|
RuoYi
|
90c41d498c
|
角色管理新增分配用户功能
|
5 years ago |
|
RuoYi
|
ce6bea4ba0
|
限制超级管理员不允许操作
|
5 years ago |
|
RuoYi
|
9c7901f526
|
用户管理新增分配角色功能
|
5 years ago |
|
疯狂的狮子li
|
efd1fc017b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-ui/vue.config.js
|
5 years ago |
|
RuoYi
|
04f5a93aa8
|
升级pagehelper到最新版1.3.1
|
5 years ago |
|
疯狂的狮子li
|
8195e948a1
|
发布 v2.4.0
|
5 years ago |
|
疯狂的狮子li
|
d05458aa3a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/main.js
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
5 years ago |
|
RuoYi
|
1ed60c79c0
|
用户信息长度校验限制
|
5 years ago |
|
RuoYi
|
aee1e53140
|
全局挂载字典标签组件
|
5 years ago |
|
疯狂的狮子li
|
c822e2f6cc
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/views/monitor/druid/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/tool/swagger/index.vue
|
5 years ago |
Ricky
|
253e2b2de1
|
增加字典标签样式回显
|
5 years ago |
|
Ricky
|
b1413f021e
|
增加字典标签样式回显
|
5 years ago |
|
疯狂的狮子li
|
ff5edc44ed
|
update 注释主子表选项 不推荐使用
|
5 years ago |
|
RuoYi
|
3f05ed6ffa
|
封装iframe组件
|
5 years ago |
|
疯狂的狮子li
|
44bbe8b307
|
update 同步更新 ruoyi 适配新功能
|
5 years ago |
|
疯狂的狮子li
|
a8c1d02ee1
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/.env.development
ruoyi-ui/.env.production
ruoyi-ui/.env.staging
ruoyi-ui/package.json
ruoyi-ui/src/App.vue
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/Pagination/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/permission.js
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/vue.config.js
|
5 years ago |
|
疯狂的狮子li
|
7dd18c75b0
|
update 更新 jackson 相关文档
|
5 years ago |
|
RuoYi
|
090ad5323a
|
日志列表支持排序操作
|
5 years ago |
|
RuoYi
|
7601a72faf
|
升级element-ui到最新版本2.15.2
|
5 years ago |
|
疯狂的狮子li
|
5311937b69
|
update 增加 jackson 配置 默认序列化时间格式
|
5 years ago |
|
疯狂的狮子li
|
bf3a88ff1a
|
发版 v2.3.2
|
5 years ago |
|
RuoYi
|
ea66e20282
|
修复用户搜索分页变量错误
|
5 years ago |
|
RuoYi
|
a209b39552
|
分页组件新增pagerCount属性
|
5 years ago |
|
RuoYi
|
557672ba9f
|
系统布局配置支持动态标题开关
|
5 years ago |
|
疯狂的狮子li
|
c5c8afe147
|
update 还原错误提交
|
5 years ago |
|
疯狂的狮子li
|
9d05d2bac5
|
remove 移除无用配置文件
|
5 years ago |
|
疯狂的狮子li
|
2103731f10
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/Navbar.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
ruoyi-ui/src/views/tool/swagger/index.vue
|
5 years ago |
|
RuoYi
|
c16ee7fc2c
|
升级swagger到最新版本v3.0.0
|
5 years ago |
|
疯狂的狮子li
|
450c6759eb
|
发布 2.3.1
|
5 years ago |
|
RuoYi
|
b7446f8d0f
|
富文本工具栏配置视频
|
5 years ago |
|
RuoYi
|
19924cd184
|
修复关闭confirm提示框控制台报错问题
|
5 years ago |
|
疯狂的狮子li
|
01c34b837d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/views/system/menu/index.vue
|
5 years ago |
|
RuoYi
|
85470a1549
|
修复表单构建选择下拉选择控制台报错问题
|
5 years ago |
kdyzm
|
6b789e2eb0
|
优化新增、修改页面的按钮动作loading从页面loading到按钮loading
|
5 years ago |
|
疯狂的狮子li
|
329c95196e
|
update 更新测试案例
|
5 years ago |
|
疯狂的狮子li
|
d9dd76f2ae
|
发布 v2.3.0
|
5 years ago |
