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 |
RuoYi
|
3f07632cd4
|
修复一级菜单包屑显示重复问题
|
2021-04-21 15:14:36 +08:00 |
Ricky
|
2c94587263
|
优化ExcelUtil空值处理
|
2021-04-21 09:53:14 +08:00 |
疯狂的狮子li
|
db43f678d8
|
!18 fix 代码生成器编辑问题
Merge pull request !18 from 疯狂的狮子li/dev
|
2021-04-19 19:02:51 +08:00 |
疯狂的狮子li
|
a4f2aa1981
|
fix 代码生成器编辑问题
|
2021-04-19 19:01:26 +08:00 |
疯狂的狮子li
|
78149e19dc
|
!17 同步 ruoyi
Merge pull request !17 from 疯狂的狮子li/dev
|
2021-04-19 17:54:33 +08:00 |
疯狂的狮子li
|
046b0bc98a
|
同步 ruoyi
|
2021-04-19 17:44:22 +08:00 |
疯狂的狮子li
|
97873a7b2b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/ThemePicker/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/store/modules/settings.js
|
2021-04-19 17:43:32 +08:00 |
疯狂的狮子li
|
f8633f8c4e
|
fix Feign 熔断不生效 bug
|
2021-04-19 17:38:47 +08:00 |
RuoYi
|
2575c17f47
|
主题颜色保存配置
|
2021-04-19 16:59:56 +08:00 |
RuoYi
|
b6f13c546b
|
过滤BindingResult对象,防止异常
|
2021-04-18 21:54:53 +08:00 |
RuoYi
|
e60a69b670
|
兼容顶部栏一级菜单内部跳转
|
2021-04-18 18:33:13 +08:00 |
RuoYi
|
cb18eec802
|
修正模板字符编码
|
2021-04-18 15:45:49 +08:00 |
RuoYi
|
bef080c60a
|
升级mybatis到最新版3.5.6 阻止远程代码执行漏洞
|
2021-04-18 15:45:37 +08:00 |
疯狂的狮子li
|
ef27ee0a28
|
!15 同步 ruoyi
Merge pull request !15 from 疯狂的狮子li/dev
|
2021-04-16 11:36:47 +08:00 |
疯狂的狮子li
|
bf5315d306
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
|
2021-04-16 11:34:39 +08:00 |
疯狂的狮子li
|
9c7efa8e0e
|
!14 fix 表名上传错误
Merge pull request !14 from 疯狂的狮子li/dev
|
2021-04-16 11:32:07 +08:00 |
疯狂的狮子li
|
a1c44b4987
|
fix 表名上传错误
|
2021-04-16 11:30:51 +08:00 |
Ricky
|
de73cf300b
|
优化树表代码生成模板
|
2021-04-15 10:39:09 +08:00 |
Ricky
|
cbcee86d2c
|
优化树表代码生成模板
|
2021-04-15 10:37:22 +08:00 |
疯狂的狮子li
|
55f8624388
|
!13 同步dev分支
Merge pull request !13 from 疯狂的狮子li/dev
|
2021-04-14 14:38:29 +08:00 |
疯狂的狮子li
|
927777291e
|
update 导出 Excel 工作表的名称修改
|
2021-04-14 14:36:27 +08:00 |
疯狂的狮子li
|
3fc3818231
|
update 完成所有原生功能使用 Mybatis-Plus 与 Lombok 重写
|
2021-04-14 13:27:27 +08:00 |
疯狂的狮子li
|
f093da99ec
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/resources/application-prod.yml
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/getters.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/views/monitor/druid/index.vue
|
2021-04-14 13:22:31 +08:00 |
疯狂的狮子li
|
adeaa77864
|
update mp化
|
2021-04-14 12:01:26 +08:00 |
疯狂的狮子li
|
48d61a3cdf
|
update mp化
|
2021-04-14 11:19:46 +08:00 |