疯狂的狮子li
|
c636e6909b
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
|
2022-01-21 18:29:44 +08:00 |
|
RuoYi
|
dccb3ac6c6
|
修复选项卡点击右键刷新丢失参数问题
|
2022-01-18 11:29:31 +08:00 |
|
疯狂的狮子li
|
911867d5a5
|
update 数据库更改 对接多用户体系
|
2022-01-17 17:09:27 +08:00 |
|
疯狂的狮子li
|
8052d75957
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# ruoyi-admin/src/main/resources/application.yml
# ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/register.vue
|
2022-01-17 15:48:09 +08:00 |
|
RuoYi
|
d7ca248bc8
|
update copyright 2022
|
2022-01-14 11:47:25 +08:00 |
|
疯狂的狮子li
|
a0bed51d96
|
update 格式化代码 统一间隔符
update 格式化代码 统一间隔符
|
2022-01-13 09:58:16 +08:00 |
|
疯狂的狮子li
|
5413b37d71
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# README.md
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
# ruoyi-ui/src/views/index.vue
|
2022-01-12 20:53:03 +08:00 |
|
RuoYi
|
9bd7509e87
|
添加新群号：264312783
|
2022-01-11 09:02:16 +08:00 |
|
RuoYi
|
9f7acd4cf9
|
优化部门修改缩放后出现的错位问题
|
2022-01-08 09:23:45 +08:00 |
|
疯狂的狮子li
|
1c7d840ff6
|
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/controller/system/SysUserController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2022-01-04 09:45:33 +08:00 |
|
RuoYi
|
c8d9b3f8fc
|
前端支持设置是否需要防止数据重复提交
|
2022-01-02 10:37:09 +08:00 |
|
RuoYi
|
c9d19cbe56
|
空值不进行回显数据字典
|
2022-01-02 10:29:15 +08:00 |
|
RuoYi
|
7bc15245aa
|
预览组件支持多图显示
|
2022-01-01 09:46:18 +08:00 |
|
RuoYi
|
cb6228800b
|
代码生成新增Java类型Boolean
|
2022-01-01 09:28:52 +08:00 |
|
RuoYi
|
6ef899d000
|
修复登录失效后多次请求提示多次弹窗问题
|
2021-12-31 10:03:54 +08:00 |
|
RuoYi
|
6353f4ff09
|
若依 3.8.1
|
2021-12-31 00:00:06 +08:00 |
|
RuoYi
|
530b2a51d5
|
修改单词拼写错误
|
2021-12-30 14:13:38 +08:00 |
|
RuoYi
|
d51e7cbb51
|
用户管理部门查询选择节点后分页参数初始
|
2021-12-29 11:04:09 +08:00 |
|
疯狂的狮子li
|
ed659da488
|
发布 v3.5.0-release 正式版
|
2021-12-28 10:35:52 +08:00 |
|
马小法
|
1294f68265
|
fix https://gitee.com/y_project/RuoYi-Vue/issues/I4O5WD
|
2021-12-27 15:33:22 +08:00 |
|
RuoYi
|
0e771a6c1b
|
升级spring-boot到最新版本2.5.8
|
2021-12-27 12:38:59 +08:00 |
|
疯狂的狮子li
|
a3504dac6e
|
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/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
ruoyi-ui/package.json
ruoyi-ui/src/main.js
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/vue.config.js
|
2021-12-20 09:47:56 +08:00 |
|
RuoYi
|
e5647793ce
|
路由支持单独配置菜单或角色权限
|
2021-12-18 16:48:31 +08:00 |
|
RuoYi
|
903b5aebca
|
新增图片预览组件
|
2021-12-18 12:23:59 +08:00 |
|
疯狂的狮子li
|
d40b9324ca
|
add oss下载增加 loading 层
|
2021-12-17 17:53:19 +08:00 |
|
18297093310
|
47b67331d4
|
修改重置表单bug
|
2021-12-17 03:06:25 +00:00 |
|
RuoYi
|
6e14601c7c
|
修复版本差异导致的懒加载报错问题
|
2021-12-16 16:34:20 +08:00 |
|
疯狂的狮子li
|
d2c6e27d07
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/views/system/user/index.vue
|
2021-12-16 14:21:04 +08:00 |
|
RuoYi
|
06aef0587a
|
用户导入提示溢出则显示滚动条
|
2021-12-16 09:50:26 +08:00 |
|
fuzui
|
43d76e5990
|
fix: cron组件中周回显bug
|
2021-12-16 02:18:48 +08:00 |
|
疯狂的狮子li
|
29c46a15f9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-system/pom.xml
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/mapper/SysPostMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.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/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.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/SysPostMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/directive/index.js
ruoyi-ui/src/plugins/download.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/system/user/authRole.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
|
2021-12-13 12:37:36 +08:00 |
|
RuoYi
|
2a235917dc
|
优化下载解析blob异常提示
|
2021-12-10 10:03:25 +08:00 |
|
RuoYi
|
44ce6774dc
|
代码生成预览支持复制内容
|
2021-12-09 09:57:02 +08:00 |
|
RuoYi
|
b911d7f78f
|
自定义文字复制剪贴指令
|
2021-12-09 09:56:11 +08:00 |
|
RuoYi
|
850b98337b
|
修正用户分配角色属性错误
|
2021-12-06 20:58:10 +08:00 |
|
RuoYi
|
6bfae2652f
|
若依 3.8.0
|
2021-12-01 08:53:11 +08:00 |
|
RuoYi
|
a2d3f987c0
|
优化代码
|
2021-11-30 11:15:17 +08:00 |
|
fuzui
|
f28a91969a
|
fix: crontab组件中规范数据范围、冗余代码去除以及部分通配符说明
|
2021-11-30 02:08:08 +08:00 |
|
fuzui
|
ca285f5e53
|
fix: crontab组件周显示及计算bug
|
2021-11-30 00:22:23 +08:00 |
|
fuzui
|
34f2552cad
|
fix: crontab组件互斥bug
|
2021-11-30 00:17:12 +08:00 |
|
疯狂的狮子li
|
dbba894544
|
发布 v3.4.0
|
2021-11-29 14:01:28 +08:00 |
|
疯狂的狮子li
|
52673152cc
|
发布 v3.4.0
|
2021-11-29 13:58:42 +08:00 |
|
疯狂的狮子li
|
81755a280d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/utils/index.js
ruoyi-ui/src/views/register.vue
|
2021-11-28 15:10:05 +08:00 |
|
RuoYi
|
89e7cb19b9
|
注册成功提示类型success
|
2021-11-26 18:11:57 +08:00 |
|
疯狂的狮子li
|
c00e397405
|
update 抽象 Excel 导入支持自定义监听器
|
2021-11-26 18:06:44 +08:00 |
|
khejing
|
e5fd1f76db
|
camelCase中应该是下划线，而不是横杠
|
2021-11-26 08:26:45 +00:00 |
|
zhujie
|
c21ff85b57
|
update 增加excel导入样例
|
2021-11-26 13:02:59 +08:00 |
|
疯狂的狮子li
|
d2b7f8ef0f
|
remove 删除无用 js 文件
|
2021-11-25 19:47:34 +08:00 |
|
疯狂的狮子li
|
af25588b88
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
# ruoyi-generator/pom.xml
# 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/vm/js/api.js.vm
# ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
# ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
# ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
# ruoyi-ui/package.json
# ruoyi-ui/src/api/monitor/server.js
# ruoyi-ui/src/components/RuoYi/Doc/index.vue
# ruoyi-ui/src/components/RuoYi/Git/index.vue
# ruoyi-ui/src/components/SizeSelect/index.vue
# ruoyi-ui/src/layout/components/Sidebar/Logo.vue
# ruoyi-ui/src/layout/components/TagsView/index.vue
# ruoyi-ui/src/layout/index.vue
# ruoyi-ui/src/main.js
# ruoyi-ui/src/plugins/download.js
# ruoyi-ui/src/router/index.js
# ruoyi-ui/src/store/modules/permission.js
# ruoyi-ui/src/store/modules/settings.js
# ruoyi-ui/src/store/modules/tagsView.js
# ruoyi-ui/src/store/modules/user.js
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/monitor/job/log.vue
# ruoyi-ui/src/views/system/dict/data.vue
# ruoyi-ui/src/views/system/role/index.vue
# ruoyi-ui/src/views/system/user/authRole.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
|
2021-11-25 19:39:53 +08:00 |
|
RuoYi
|
31106c91fb
|
修复使用 this.$options.data 报错问题
|
2021-11-24 15:00:51 +08:00 |
|