疯狂的狮子li
|
2f18d0d709
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
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/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-09-18 16:01:52 +08:00 |
|
RuoYi
|
12ab8b03d9
|
使用vue-data-dict，简化数据字典使用
|
2021-09-17 15:36:54 +08:00 |
|
疯狂的狮子li
|
ab4b75fe30
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
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/ThemePicker/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/layout/index.vue
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/store/modules/tagsView.js
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-09-06 09:59:28 +08:00 |
|
RuoYi
|
e49f0cebf1
|
自定义弹层溢出滚动样式
|
2021-09-03 13:27:03 +08:00 |
|
疯狂的狮子li
|
f566c39026
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/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-09-03 10:55:58 +08:00 |
|
RuoYi
|
6361e4efdc
|
定时任务支持在线生成cron表达式
|
2021-09-03 09:54:07 +08:00 |
|
疯狂的狮子li
|
80784433b8
|
remove 移除分页合理化参数 使用 MP 全局配置分页溢出
|
2021-09-02 15:59:42 +08:00 |
|
RuoYi
|
a15bfdfb46
|
防止表格最后页最后项删除变成暂无数据
|
2021-09-02 10:55:10 +08:00 |
|
疯狂的狮子li
|
1a695159e3
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
ruoyi-ui/src/api/login.js
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/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-09-02 10:49:56 +08:00 |
|
RuoYi
|
ee823b8326
|
防止表格最后页最后项删除变成暂无数据
|
2021-09-02 10:19:04 +08:00 |
|
疯狂的狮子li
|
adb31b71f8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/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/menu/index.vue
ruoyi-ui/src/views/system/notice/index.vue
ruoyi-ui/src/views/system/post/index.vue
|
2021-09-01 09:40:36 +08:00 |
|
马小法
|
8040ad8c03
|
修改数据字典回显
|
2021-08-30 16:53:16 +08:00 |
|
疯狂的狮子li
|
f91ebd93d2
|
update 重构 将下载excel工具提取到全局
|
2021-08-23 18:28:33 +08:00 |
|
疯狂的狮子li
|
5ca4478540
|
update 更新 SysJob 导入导出 补全 SysUser 试图对象
|
2021-08-04 18:52:09 +08:00 |
|
疯狂的狮子li
|
06944747fd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-07-27 12:42:41 +08:00 |
|
RuoYi
|
6a5c86541a
|
跳转路由高亮相对应的菜单栏
|
2021-07-27 11:54:20 +08:00 |
|
RuoYi
|
0a516e3001
|
更多操作按钮添加权限控制
|
2021-07-25 10:20:52 +08:00 |
|
疯狂的狮子li
|
1f2cf719da
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-ui/src/views/monitor/job/index.vue
|
2021-07-21 14:00:07 +08:00 |
|
RuoYi
|
b616a2f2e7
|
定时任务新增更多操作
|
2021-07-15 17:35:33 +08:00 |
|
疯狂的狮子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
|
2021-06-10 09:44:56 +08:00 |
|
RuoYi
|
19924cd184
|
修复关闭confirm提示框控制台报错问题
|
2021-06-03 13:24:29 +08:00 |
|
疯狂的狮子li
|
6c195af2a3
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-generator/pom.xml
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/public/index.html
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/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
|
2021-05-25 10:00:36 +08:00 |
|
RuoYi
|
b431703262
|
导出按钮点击之后添加遮罩
|
2021-05-17 15:37:58 +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
|
57a2eb4217
|
操作按钮组调整为朴素按钮样式
|
2021-01-04 17:48:46 +08:00 |
|
疯狂的狮子li
|
8ca53c7666
|
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/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/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2020-10-12 09:54:59 +08:00 |
|
RuoYi
|
b0965653bf
|
删除不必要的代码
|
2020-10-10 17:54:30 +08:00 |
|
疯狂的狮子li
|
bd39b971cf
|
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/utils/ruoyi.js
ruoyi-ui/src/views/monitor/job/index.vue
|
2020-10-10 09:19:20 +08:00 |
|
RuoYi
|
dd721ff894
|
修正定时任务执行一次权限标识
|
2020-10-07 13:36:55 +08:00 |
|
疯狂的狮子li
|
3aaff7b776
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/main.js
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
|
2020-08-12 10:16:29 +08:00 |
|
RuoYi
|
74f52677be
|
表格右侧工具栏组件
|
2020-08-10 10:12:39 +08:00 |
|
平凡
|
5b04f388e9
|
重写表格工具栏右侧添加刷新&显隐查询栏
|
2020-08-09 11:07:10 +08:00 |
|
疯狂的狮子li
|
c966d9bada
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.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/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.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/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/babel.config.js
ruoyi-ui/package.json
ruoyi-ui/src/api/tool/gen.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/ruoyi.js
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/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/vue.config.js
sql/ry_20200724.sql
|
2020-08-02 18:31:47 +08:00 |
|
RuoYi
|
4dcf737db0
|
表格工具栏右侧添加刷新&显隐查询栏
|
2020-08-01 15:45:38 +08:00 |
|
疯狂的狮子li
|
6bb7db31aa
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/components/IconSelect/index.vue
ruoyi-ui/src/permission.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
ruoyi/src/main/resources/vm/vue/index.vue.vm
ruoyi/src/main/resources/vm/xml/mapper.xml.vm
|
2020-06-08 12:01:19 +08:00 |
|
RuoYi
|
7afc5acc6f
|
定时任务调整label-width，防止部署出现错位
|
2020-06-07 17:52:14 +08:00 |
|
疯狂的狮子li
|
5f866906d1
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
ruoyi-ui/src/api/system/config.js
ruoyi-ui/src/api/system/dict/data.js
ruoyi-ui/src/api/system/dict/type.js
ruoyi-ui/src/assets/styles/element-variables.scss
ruoyi-ui/src/components/SvgIcon/index.vue
ruoyi-ui/src/layout/components/Sidebar/Link.vue
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/views/monitor/job/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/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
ruoyi-ui/vue.config.js
ruoyi/pom.xml
ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
ruoyi/src/main/resources/application.yml
ruoyi/src/main/resources/vm/sql/sql.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
2020-06-01 13:34:08 +08:00 |
|
RuoYi
|
b4b3ff8813
|
若依 2.3
|
2020-06-01 10:49:36 +08:00 |
|
疯狂的狮子li
|
98941acd2a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/api/system/dept.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java
ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
ruoyi/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
ruoyi/src/main/resources/application.yml
|
2020-05-20 09:15:19 +08:00 |
|
RuoYi
|
9aeb0cc1f3
|
修复定时任务执行一次按钮后不提示消息问题
|
2020-05-17 15:47:29 +08:00 |
|
疯狂的狮子li
|
4bee0d652a
|
修复前端页面报错 找不到模块问题
|
2020-04-25 20:09:39 +08:00 |
|
疯狂的狮子li
|
44e2618ee2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/monitor/job/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/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/tool/gen/importTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/sql/ry_20200415.sql
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
ruoyi/src/main/resources/vm/sql/sql.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
2020-04-21 09:08:48 +08:00 |
|
RuoYi
|
14392d9764
|
dialog添加append-to-body属性，防止ie遮罩
|
2020-04-17 14:14:54 +08:00 |
|
疯狂的狮子li
|
39d8723159
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
|
2020-03-24 15:29:45 +08:00 |
|
RuoYi
|
e07d4c18ee
|
定时任务并发属性修正
|
2020-03-22 18:02:33 +08:00 |
|
疯狂的狮子li
|
b1afb78ca2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
ruoyi-ui/src/components/SvgIcon/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/tagsView.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi/pom.xml
ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java
ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java
ruoyi/src/main/resources/application.yml
|
2020-03-19 09:10:03 +08:00 |
|
RuoYi
|
2cc14e5f56
|
若依 2.2
|
2020-03-18 09:43:17 +08:00 |
|
疯狂的狮子li
|
2841620be6
|
初始化项目
|
2020-02-13 10:48:51 +08:00 |
|
疯狂的狮子li
|
abdb1048ed
|
删除文件 ruoyi-ui
|
2020-02-13 10:47:14 +08:00 |
|
RuoYi
|
46444bd0fe
|
RuoYi-Vue 1.0
|
2019-10-08 09:14:38 +08:00 |
|