Commit Graph

730 Commits

Author SHA1 Message Date
疯狂的狮子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 d48946ab90 fix bo缺包问题 2021-04-12 10:34:50 +08:00
疯狂的狮子li 88841ac01f update Date参数接收Bo实体格式转换 2021-04-09 11:47:51 +08:00
疯狂的狮子li 8b37eca241 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/utils/zipdownload.js
2021-04-08 17:12:13 +08:00
疯狂的狮子li 1d3a361a66 fix 字节转换 bug 2021-04-08 16:40:10 +08:00
疯狂的狮子li c862484f00 update 默认增加editBo主键生成 2021-04-08 16:29:35 +08:00
RuoYi b56b8846d9 修改主题后mini类型按钮无效问题 2021-04-08 13:54:48 +08:00
RuoYi 8e1e4cd8fe 通用下载完成后删除节点 2021-04-08 13:46:22 +08:00
若依 9fa5c79713 !200 update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java.
Merge pull request !200 from yvan7123/N/A
2021-04-08 13:42:30 +08:00
若依 40a72c2b7e !199 规范命名、用户角色单个逻辑删除、去除多余代码
Merge pull request !199 from fuzui/some_problems
2021-04-08 13:40:28 +08:00
yvan7123 6fe9a358b7 update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java. 2021-04-06 11:47:27 +08:00
疯狂的狮子li ccd48965a8 fix controller 接口路径问题 2021-04-04 20:01:36 +08:00
疯狂的狮子li b6472f3469 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-04-04 11:27:42 +08:00
疯狂的狮子li 866c69e706 fix 代码生成器问题 2021-04-04 11:27:08 +08:00
疯狂的狮子li a50df84a72 fix 生成 remove 方法参数类型错误 2021-04-03 17:00:47 +08:00
wangze 9f6bc13e64 🔥 去除多余代码 2021-04-02 23:06:48 +08:00
疯狂的狮子li 6760942218 fix Page 路径导入 2021-04-02 23:05:44 +08:00
wangze ba5ab4b091 用户、角色单条删除时,使其逻辑删除 2021-04-02 22:49:19 +08:00
wangze 17407d0127 调整cache_repeat_key为驼峰格式 2021-04-02 22:40:15 +08:00
疯狂的狮子li b71e74927e add 添加单模块分支 2021-04-02 16:14:58 +08:00
疯狂的狮子li 7e50364244 add 添加单模块分支 2021-04-02 16:14:21 +08:00
疯狂的狮子li b82fa6534b add 添加多模块分支 2021-04-02 16:12:09 +08:00
疯狂的狮子li 74a4848205 add 添加单模块分支 2021-04-02 16:11:23 +08:00
疯狂的狮子li 4e58887b9a add 增加单模块项目 2021-04-02 16:01:07 +08:00
疯狂的狮子li dfcd84c2bc fix 数据权限语句null bug 2021-04-02 15:44:02 +08:00
疯狂的狮子li 3012bf0a31 add 增加数据权限注入 2021-04-02 14:22:27 +08:00
疯狂的狮子li 85e9534fae add 增加数据权限注入 2021-04-02 14:15:10 +08:00
疯狂的狮子li 4a1ff5a5ac update 修改controller生成模板 规范代码结构 2021-04-01 17:57:54 +08:00
疯狂的狮子li 222dfd1fe1 update 修改xml生成模板 附加domain类路径 2021-04-01 17:57:24 +08:00
疯狂的狮子li c1964b934f update 简化queryById代码生成器 2021-03-31 16:51:24 +08:00
疯狂的狮子li b16fe5e263 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/views/tool/build/index.vue
2021-03-31 16:49:45 +08:00
RuoYi 30f330f4a0 修复firefox下表单构建拖拽会新打卡一个选项卡 2021-03-30 17:45:35 +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
若依 fc57e91b80 !196 RepeatedlyRequestWrapper.ServletInputStream 实现available方法
Merge pull request !196 from wangyang/master
2021-03-30 15:17:34 +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
若依 266a5e844f !193 修复request.getInputStream() 重复读取错误问题
Merge pull request !193 from MccRay/master
2021-03-27 13:22:01 +08:00
疯狂的狮子li 06e9feadee Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
2021-03-26 14:07:53 +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 77ffdf69a1 fix 修复 vo转换 分页bug 2021-03-25 17:01:17 +08:00
疯狂的狮子li e3bcc6b273 fix 查询类模板缺少导入包 2021-03-25 17:00:40 +08:00