wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,320 Commits 2 Branches 0 Tags 6 MiB
Commit Graph

1320 Commits

Author SHA1 Message Date
疯狂的狮子li 3b73bbe0ac 版本更新 v1.0.1 2021-05-11 17:36:52 +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 99726be9ac 修正导入表权限标识 2021-05-11 14:26:20 +08:00
RuoYi 32f333a00e 删除操作日志记录日志 2021-05-11 14:25:39 +08:00
RuoYi be5c19b764 树级结构更新子节点使用replaceFirst 2021-05-11 14:25:25 +08:00
RuoYi dd384e4a31 上传媒体类型添加视频格式 2021-05-11 14:25:08 +08:00
若依 bdde195e2b !225 【bug修复】文件上传时出现java.nio.file.FileAlreadyExistsException 
Merge pull request !225 from CANYON/master
 2021-05-11 14:19:53 +08:00
疯狂的狮子li dafdb43c84 update 配置转移到 yml 文件 统一管理 2021-05-11 10:02:32 +08:00
疯狂的狮子li 961c60dd1a update 更新banner 2021-05-10 23:53:15 +08:00
疯狂的狮子li e124de4b80 !31 同步dev分支 
Merge pull request !31 from 疯狂的狮子li/dev
 2021-05-10 15:35:09 +08:00
疯狂的狮子li 98624e66e5 正式发布 1.0.0 2021-05-10 15:34:17 +08:00
疯狂的狮子li 5343b03493 update 更新作者二维码 2021-05-08 23:57:09 +08:00
疯狂的狮子li 60895bf8d6 update 更新作者二维码 2021-05-08 23:54:52 +08:00
疯狂的狮子li d50e7a3d17 !30 同步dev分支 
Merge pull request !30 from 疯狂的狮子li/dev
 2021-05-08 23:39:50 +08:00
疯狂的狮子li a181c09786 fix 修复数据权限问题 2021-05-08 23:35:39 +08:00
疯狂的狮子li 7c8dd238de !29 同步dev分支 
Merge pull request !29 from 疯狂的狮子li/dev
 2021-05-08 17:08:21 +08:00
疯狂的狮子li 0b6952d0fe fix 日志时间sql符号转换问题 2021-05-08 17:05:18 +08:00
疯狂的狮子li 6ce4c93b3c fix 日志时间sql符号转换问题 2021-05-08 16:55:50 +08:00
libin 14ea071306 修复文件上传时java.nio.file.FileAlreadyExistsException 2021-05-08 15:31:16 +08:00
RuoYi 50034301ac 添加新群号：201396349 2021-05-06 20:40:25 +08:00
若依 85ed712c50 !222 update ruoyi-ui/src/assets/styles/element-ui.scss. 
Merge pull request !222 from leizhuogogo/N/A
 2021-05-06 20:39:36 +08:00
若依 f67d682345 !221 update ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java. 
Merge pull request !221 from phper08/N/A
 2021-05-06 20:39:26 +08:00
疯狂的狮子li 0656dc381d !28 同步dev分支 
Merge pull request !28 from 疯狂的狮子li/dev
 2021-05-06 17:52:14 +08:00
leizhuogogo 3f1427eef9 update ruoyi-ui/src/assets/styles/element-ui.scss. 2021-05-06 17:50:28 +08:00
疯狂的狮子li 882f65fdce update 项目地址项目名 2021-05-06 17:44:46 +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 f1fccb7a66 !27 同步dev分支 
Merge pull request !27 from 疯狂的狮子li/dev
 2021-04-28 15:59:28 +08:00
疯狂的狮子li 73db99398f fix 部门权限问题 2021-04-28 15:58:08 +08:00
疯狂的狮子li 0af493ad67 !26 同步dev分支 
Merge pull request !26 from 疯狂的狮子li/dev
 2021-04-28 11:53:09 +08:00
疯狂的狮子li bc182f1392 fix 日志时间问题 2021-04-28 11:52:21 +08:00
疯狂的狮子li 91c6ae307d Merge remote-tracking branch 'origin/master' 2021-04-25 10:40:15 +08:00
疯狂的狮子li aabae8eb01 update 修改MP验证策略 NOT_NULL -> NOT_EMPTY 2021-04-25 10:40:09 +08:00
疯狂的狮子li e3ea16d020 update 修改MP验证策略 NOT_NULL -> NOT_EMPTY 2021-04-25 10:38:20 +08:00
疯狂的狮子li ad991c9d8e !25 同步 ruoyi 
Merge pull request !25 from 疯狂的狮子li/dev
 2021-04-25 09:46:06 +08:00
疯狂的狮子li c0e5e9cb24 update 同步ruoyi 2021-04-25 09:45:45 +08:00
疯狂的狮子li ae48c160b0 !24 修复问题 
Merge pull request !24 from 疯狂的狮子li/dev
 2021-04-25 09:39:52 +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 251547e79e update 重写MP注入器 2021-04-25 09:19:38 +08:00
疯狂的狮子li b222c4215b !23 同步dev 
Merge pull request !23 from 疯狂的狮子li/dev
 2021-04-23 16:00:06 +08:00
疯狂的狮子li 734073019f update 屏蔽用户密码返回 2021-04-23 15:59:46 +08:00
疯狂的狮子li 9a26a3c4e8 !22 同步 master 
Merge pull request !22 from 疯狂的狮子li/master
 2021-04-22 21:14:48 +08:00
疯狂的狮子li 1bef814c51 update 补全实体类 注入注解 2021-04-22 21:07:18 +08:00
疯狂的狮子li 6dc791c34f !21 同步dev分支 
Merge pull request !21 from 疯狂的狮子li/dev
 2021-04-22 15:42:00 +08:00
疯狂的狮子li 5fcef39a2e add 集成 spring-boot-admin 全方位监控 2021-04-22 15:04:35 +08:00
疯狂的狮子li 7ae9f21f82 !20 fix 问题 
Merge pull request !20 from 疯狂的狮子li/dev
 2021-04-22 10:08:12 +08:00
疯狂的狮子li 5b4e9ef4db Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev 2021-04-22 09:50:03 +08:00
疯狂的狮子li 39e9df47bc !19 修改添加用户获取到密码为null 
Merge pull request !19 from 再见亦是路人/master
 2021-04-22 09:49:38 +08:00
疯狂的狮子li 9173f9c9cb fix feign熔断问题 2021-04-22 09:32:28 +08:00
RuoYi 62081aebb9 修复开启TopNav后，左侧打开外链问题 2021-04-21 16:34:44 +08:00
再见亦是路人 a4b71278c0 修改用户密码获取失败 2021-04-21 15:56:00 +08:00