若依
|
504638eb41
|
!234 【轻量级 PR】:删去两处冗余代码
Merge pull request !234 from xivLi/master
|
2021-05-24 11:30:21 +08:00 |
RuoYi
|
7b94ae3a9a
|
xss校验json条件优化
|
2021-05-23 19:20:36 +08:00 |
xivLi
|
9651a7d7fc
|
删去utils.uuid下 IdUtils类中 多余的import(同包下的UUID类)
|
2021-05-22 15:52:19 +08:00 |
lyqwer
|
b2914cbcb1
|
修正方法名单词拼写错误
|
2021-05-21 17:24:48 +08:00 |
疯狂的狮子li
|
97a237bbdc
|
update springboot 升级 2.3.11
update mybatis-plus 升级 3.4.3 分页Plus对象适配更新
|
2021-05-21 11:50:47 +08:00 |
疯狂的狮子li
|
7076deb2b6
|
update 请求响应对象 与 分页对象 结构修改 适配接口文档配置
|
2021-05-20 13:23:12 +08:00 |
疯狂的狮子li
|
2ebcffb22e
|
update 配置统一提取为 properties 配置类
|
2021-05-17 13:39:59 +08:00 |
疯狂的狮子li
|
5bc6057050
|
fix maven install 异常
|
2021-05-16 10:29:13 +08:00 |
疯狂的狮子li
|
87164d574e
|
update 删除过期方法
|
2021-05-16 09:25:19 +08:00 |
疯狂的狮子li
|
69b9a4db2b
|
update 通用Service接口 增加自定义vo转换函数
|
2021-05-15 14:27:29 +08:00 |
疯狂的狮子li
|
ee064fa84c
|
update swagger升级3.0.2
|
2021-05-15 14:25:48 +08:00 |
疯狂的狮子li
|
31db658929
|
update 增强分页工具兼容性
|
2021-05-15 11:32:05 +08:00 |
疯狂的狮子li
|
6067cb1797
|
add 增加增强Mapper 重写业务适配
|
2021-05-14 13:01:18 +08:00 |
疯狂的狮子li
|
b0417338cc
|
add 增加升级版通用Service IServicePlus
|
2021-05-13 21:24:47 +08:00 |
疯狂的狮子li
|
20e82d708b
|
remove 移除 pagehelper 分页工具
|
2021-05-13 21:23:50 +08:00 |
疯狂的狮子li
|
9f5a03edcd
|
add 增加分页工具
|
2021-05-13 21:22:51 +08:00 |
疯狂的狮子li
|
c33c3de43a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-ui/src/assets/styles/element-ui.scss
ruoyi-ui/src/views/index.vue
|
2021-05-11 17:14:53 +08:00 |
RuoYi
|
dd384e4a31
|
上传媒体类型添加视频格式
|
2021-05-11 14:25:08 +08:00 |
疯狂的狮子li
|
98624e66e5
|
正式发布 1.0.0
|
2021-05-10 15:34:17 +08:00 |
libin
|
14ea071306
|
修复文件上传时java.nio.file.FileAlreadyExistsException
|
2021-05-08 15:31:16 +08:00 |
phper08
|
7d0f5e94ef
|
update ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java.
|
2021-05-03 13:18:33 +08:00 |
疯狂的狮子li
|
c0e5e9cb24
|
update 同步ruoyi
|
2021-04-25 09:45:45 +08:00 |
疯狂的狮子li
|
4e723f4936
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
|
2021-04-25 09:27:07 +08:00 |
疯狂的狮子li
|
734073019f
|
update 屏蔽用户密码返回
|
2021-04-23 15:59:46 +08:00 |
疯狂的狮子li
|
1bef814c51
|
update 补全实体类 注入注解
|
2021-04-22 21:07:18 +08:00 |
疯狂的狮子li
|
5fcef39a2e
|
add 集成 spring-boot-admin 全方位监控
|
2021-04-22 15:04:35 +08:00 |
再见亦是路人
|
a4b71278c0
|
修改用户密码获取失败
|
2021-04-21 15:56:00 +08:00 |
Ricky
|
2c94587263
|
优化ExcelUtil空值处理
|
2021-04-21 09:53:14 +08:00 |
疯狂的狮子li
|
48d61a3cdf
|
update mp化
|
2021-04-14 11:19:46 +08:00 |
疯狂的狮子li
|
876a06a9cd
|
update mp化
|
2021-04-13 17:14:50 +08:00 |
疯狂的狮子li
|
20d40ea691
|
update mp化
|
2021-04-13 15:29:05 +08:00 |
疯狂的狮子li
|
d69d1fbfe8
|
update 更新任务调度模块 与 代码生成模块 MP lombok 化
|
2021-04-12 17:49:56 +08:00 |
疯狂的狮子li
|
323fe960bd
|
update 更新基础包与核心包 lombok 化
|
2021-04-12 17:26:47 +08:00 |
疯狂的狮子li
|
938ca5c451
|
fix 补全缺包
|
2021-04-12 17:09:05 +08:00 |
疯狂的狮子li
|
4500db395f
|
update ruoyi原生改为 MP lombok 格式
update SysConfig 模块代码
|
2021-04-12 17:02:55 +08:00 |
疯狂的狮子li
|
fdacc04582
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
|
2021-03-30 17:21:22 +08:00 |
RuoYi
|
6ca7870393
|
修正注释
|
2021-03-30 15:30:18 +08:00 |
若依
|
2a7342ec43
|
!195 读取excel增加非空判断
Merge pull request !195 from 叫我宏锅锅/yuhong
|
2021-03-30 15:23:04 +08:00 |
疯狂的狮子li
|
96d10126b2
|
修复request.getInputStream() 重复读取错误问题
|
2021-03-30 11:41:24 +08:00 |
疯狂的狮子li
|
a29ebef202
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java
|
2021-03-30 11:38:56 +08:00 |
wangyuanyang
|
347f36ceff
|
fix:RepeatedlyRequestWrapper.ServletInputStream 实现available方法
|
2021-03-29 10:17:31 +08:00 |
yuhong0206@sina.cn
|
9b9c1b999f
|
读取excel增加
if(row == null)
{
continue;
}
判断。防止有时候Excel表中有空数据行,导致读取时出现空指针异常。
|
2021-03-29 09:00:44 +08:00 |
yuhong0206@sina.cn
|
ec627704b2
|
取消
|
2021-03-29 08:58:46 +08:00 |
yuhong0206@sina.cn
|
9e6b2a1265
|
读取excel增加
if(row == null)
{
continue;
}
判断。防止有时候Excel表中有空数据行,导致读取时出现空指针异常。
|
2021-03-29 08:56:51 +08:00 |
MccRay
|
0822680158
|
update ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java.
修复 getInputStream() has already been called for this request异常问题
|
2021-03-25 17:39:51 +08:00 |
疯狂的狮子li
|
62464cfe45
|
fix Collection 验证失效问题
|
2021-03-22 13:31:43 +08:00 |
wugh
|
3d6fbb93f5
|
!11 [功能] 拆分出Vo,QueryBo,AddBo,EditBo等领域对象
* [修改] 错误引入的无用导包删除
* [新增] 增加Vo,QueryBo,AddBo,EditBo等视图,并调整controller,service的调用代码
* [新增] 增加CreateAndUpdateMetaObjectHandler,配合fill注解,实现创建和修改人的自动设置,减少重复代码
|
2021-03-22 09:32:49 +08:00 |
疯狂的狮子li
|
a7f235164f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
|
2021-03-18 13:08:14 +08:00 |
RuoYi
|
01b545e4ab
|
通用Controller添加响应返回消息
|
2021-03-16 14:43:55 +08:00 |
疯狂的狮子li
|
63a582404b
|
update swagger 模板修改为 swagger-bootstrap-ui
|
2021-03-15 17:51:00 +08:00 |
疯狂的狮子li
|
04e1dc351e
|
update 移除无用依赖
|
2021-03-15 17:50:24 +08:00 |
疯狂的狮子li
|
9b4b9e0c74
|
update 删除通用工具 改为使用hutool
|
2021-03-15 16:38:43 +08:00 |
疯狂的狮子li
|
71325b540a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application-prod.yml
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
|
2021-03-15 10:00:14 +08:00 |
RuoYi
|
c2e9200626
|
数据监控默认账户密码防止越权访问
|
2021-03-14 16:37:34 +08:00 |
疯狂的狮子li
|
2b8ab9cc4d
|
update 使用hutool重写系统监控
|
2021-03-12 18:02:23 +08:00 |
疯狂的狮子li
|
57cfad671f
|
update 使用hutool重写验证码生成
|
2021-03-12 16:52:55 +08:00 |
疯狂的狮子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
|
2021-03-09 09:32:49 +08:00 |
RuoYi
|
61432480c8
|
删除多余的代码
|
2021-03-07 11:06:47 +08:00 |
tzg
|
9a384a2fc2
|
解决 Byte[] 类型 to string 死循环的问题
|
2021-02-23 16:30:14 +08:00 |
疯狂的狮子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
|
2021-02-22 10:04:43 +08:00 |
RuoYi
|
0b5c7f4c96
|
若依 3.4.0
|
2021-02-22 09:40:28 +08:00 |
疯狂的狮子li
|
118c02144f
|
集成 Feign 接口化管理 Http请求(如短信,支付,推送等)
|
2021-01-27 15:15:03 +08:00 |
疯狂的狮子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
|
2021-01-11 09:58:41 +08:00 |
RuoYi
|
14a859899c
|
代码生成模板支持主子表
|
2021-01-08 10:47:36 +08:00 |
X.B-H
|
b7cdd10f9f
|
修复导入数据为负浮点数时丢失精度问题
|
2021-01-06 11:11:11 +08:00 |
疯狂的狮子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
|
2021-01-06 09:35:00 +08:00 |
RuoYi
|
edd090a098
|
代码生成支持文件上传组件
|
2021-01-05 20:59:14 +08:00 |
RuoYi
|
074b3c735d
|
设置单图上传控件
|
2021-01-05 16:17:41 +08:00 |
疯狂的狮子li
|
e9d368ed0c
|
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-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
|
2020-12-30 16:20:09 +08:00 |
RuoYi
|
63992ac906
|
代码生成数据库文本类型生成表单文本域
|
2020-12-29 11:14:48 +08:00 |
疯狂的狮子li
|
93e7f53cf8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-28 10:40:13 +08:00 |
RuoYi
|
0187344798
|
Excel注解支持Image图片导出
|
2020-12-27 10:04:45 +08:00 |
疯狂的狮子li
|
f44ff8477f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
|
2020-12-16 12:44:21 +08:00 |
RuoYi
|
6cf2a8edeb
|
升级SpringBoot到最新版本2.2.12 提升启动速度
|
2020-12-16 10:05:53 +08:00 |
疯狂的狮子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
|
2020-12-14 09:27:27 +08:00 |
RuoYi
|
8988d0b4ab
|
若依 3.3.0
|
2020-12-14 09:02:10 +08:00 |
RuoYi
|
89e1f2a53f
|
修改Set可能导致嵌套的问题
|
2020-12-13 15:01:03 +08:00 |
BecomeDream
|
e8f63b2994
|
修改Set可能导致嵌套的问题
|
2020-12-11 18:16:57 +08:00 |
疯狂的狮子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
|
2020-12-11 14:27:54 +08:00 |
RuoYi
|
9e387dc447
|
去除用户手机邮箱部门必填验证
|
2020-12-11 13:26:14 +08:00 |
疯狂的狮子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
|
2020-12-04 11:46:29 +08:00 |
RuoYi
|
ef92ad4d8c
|
支持get请求映射params参数
|
2020-12-04 10:52:20 +08:00 |
RuoYi
|
0e2b97a886
|
升级poi到最新版本4.1.2
|
2020-12-03 13:28:04 +08:00 |
RuoYi
|
1c7a5faae8
|
Excel支持注解align对齐方式
|
2020-12-03 13:26:46 +08:00 |
疯狂的狮子li
|
ce438f182a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
sql/ry_20201128.sql
|
2020-11-30 12:41:39 +08:00 |
RuoYi
|
2797c1eb3a
|
修正转换字符串的目标字符集属性
|
2020-11-30 10:31:11 +08:00 |
RuoYi
|
a69cc94f35
|
三级菜单自动配置组件
|
2020-11-28 20:39:03 +08:00 |
RuoYi
|
a3b86d6f6d
|
代码生成删除多余的数字float类型
|
2020-11-28 12:09:24 +08:00 |
RuoYi
|
fd831d5a90
|
Excel支持导入Boolean型数据
|
2020-11-28 12:08:55 +08:00 |
疯狂的狮子li
|
15c4428b9c
|
修改 ruoyi CharsetKit.java bug
|
2020-11-24 11:54:38 +08:00 |
疯狂的狮子li
|
ff563c44e2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.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/views/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
|
2020-11-18 10:41:13 +08:00 |
RuoYi
|
8f145bba3a
|
若依 v3.2.1
|
2020-11-18 09:32:15 +08:00 |
RuoYi
|
6bb166b89f
|
阻止任意文件下载漏洞
|
2020-11-17 10:29:52 +08:00 |
RuoYi
|
823e95667e
|
代码生成支持上传控件
|
2020-11-16 16:20:17 +08:00 |
疯狂的狮子li
|
1a15c528a2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
|
2020-10-16 10:27:13 +08:00 |
RuoYi
|
403f5c5dcf
|
解决代码生成没有bit类型的问题
|
2020-10-14 17:08:20 +08:00 |
RuoYi
|
69256940df
|
若依 3.2
|
2020-10-10 09:38:21 +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 |
疯狂的狮子li
|
aefa2095f0
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
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/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.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/SysRoleMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
sql/ry_20200920.sql
|
2020-09-22 13:22:30 +08:00 |
RuoYi
|
28bceda630
|
修正文字错误
|
2020-09-22 11:09:18 +08:00 |