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

989 Commits

Author SHA1 Message Date
RuoYi 2116ee1822 Update copyright 2021-01-04 17:49:52 +08:00
RuoYi 57a2eb4217 操作按钮组调整为朴素按钮样式 2021-01-04 17:48:46 +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 647af5b485 菜单组件修改允许空字符串 2020-12-29 17:27:48 +08:00
若依 3f33219134 !156 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空 
Merge pull request !156 from li_oxen/N/A
 2020-12-29 17:14:31 +08:00
li_oxen a04bb71777 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空 2020-12-29 13:51:15 +08:00
RuoYi 63992ac906 代码生成数据库文本类型生成表单文本域 2020-12-29 11:14:48 +08:00
疯狂的狮子li b8f6731584 增加 demo模块 方便参考扩展 2020-12-29 10:17:44 +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 c24b912b50 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/store/modules/permission.js
 2020-12-25 09:59:24 +08:00
RuoYi a9c6ba12e6 代码生成日期控件区分范围 2020-12-25 09:35:20 +08:00
RuoYi ba068eae65 修正侧边栏静态路由丢失问题 2020-12-24 19:32:18 +08:00
疯狂的狮子li 476df3117b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/utils/permission.js
	ruoyi-ui/src/utils/request.js
 2020-12-24 10:04:54 +08:00
若依 1a87ee7c19 防止get请求参数值为false或0等特殊值会导致无法正确的传参 
Merge pull request !146 from wugh/hotfix/gitee-issue_I2A5FU
 2020-12-22 16:19:51 +08:00
DokiYoloo 3c4b01ab83 权限工具类增加admin判断 2020-12-21 19:43:57 +08:00
疯狂的狮子li 1000a577d0 配置文件新增redis数据库索引属性 2020-12-21 11:58:49 +08:00
wugh 886ce995af [bug修复] 解决get请求,如果参数值为false或0等特殊值会导致无法正确传参 2020-12-21 11:58:15 +08:00
疯狂的狮子li 78ef398257 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/src/store/modules/permission.js
 2020-12-21 11:55:32 +08:00
RuoYi 52264b6e2a 优化多级菜单之间切换无法缓存的问题 2020-12-21 10:50:48 +08:00
RuoYi fd7e88a518 配置文件新增redis数据库索引属性 2020-12-21 10:26:54 +08:00
若依 854a6f805f !145 redis 增加 database配置项，设置不同的库 
Merge pull request !145 from li_oxen/N/A
 2020-12-21 10:13:47 +08:00
li_oxen 1caec85f46 redis 增加 database配置项，设置不同的库 2020-12-19 10:08:09 +08:00
疯狂的狮子li 805c79506b 代码生成 后端支持 between 2020-12-18 17:46:05 +08:00
疯狂的狮子li 817da5bc04 修复export与list结果不统一问题 2020-12-18 16:50:58 +08:00
wangxianl a514330db3 修复export与list结果不统一的问题 2020-12-18 15:47:07 +08:00
疯狂的狮子li 2b0cf24be4 修改 controller 生成器 解决where条件重复bug 2020-12-18 09:47:35 +08:00
疯狂的狮子li 6c8497f632 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/components/Breadcrumb/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	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
 2020-12-18 09:45:54 +08:00
疯狂的狮子li b029a7265a 将controller条件查询器改完隐式泛型 2020-12-18 00:02:40 +08:00
RuoYi c86dc20743 移除path-to-regexp正则匹配插件 2020-12-17 12:05:29 +08:00
RuoYi ecc7a8be46 优化多级菜单之间切换无法缓存的问题 2020-12-16 20:57:48 +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 e23ad20186 README 2020-12-16 10:20:02 +08:00
RuoYi 6cf2a8edeb 升级SpringBoot到最新版本2.2.12 提升启动速度 2020-12-16 10:05:53 +08:00
疯狂的狮子li 1249c7ca26 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/views/login.vue
 2020-12-15 10:25:00 +08:00
RuoYi 67198aede9 README 2020-12-15 10:06:12 +08:00
RuoYi 4f33da2a3f 登录后push添加catch防止出现检查错误 2020-12-15 10:04:09 +08:00
疯狂的狮子li 1ec7073027 同步升级 3.3 2020-12-14 09:28:15 +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 ceefa20aa2 调整代码生成页列宽 2020-12-13 16:05:49 +08:00
RuoYi 89e1f2a53f 修改Set可能导致嵌套的问题 2020-12-13 15:01:03 +08:00
若依 6800a12014 !138 修改Set可能导致嵌套的问题 
Merge pull request !138 from BecomeDream/N/A
 2020-12-13 14:54:17 +08:00
疯狂的狮子li 8d4f3561d5 修复mybatis-plus插件不生效bug 2020-12-11 18:45:57 +08:00
BecomeDream e8f63b2994 修改Set可能导致嵌套的问题 2020-12-11 18:16:57 +08:00
RuoYi ecfe7006e2 代码生成预览支持高亮显示 2020-12-11 17:04:54 +08:00
疯狂的狮子li 8b88d91312 update README.md 2020-12-11 14:44:07 +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
若依 231bbf6928 !135 增加日志记录过滤对象类型（解决多文件场景报错） 
Merge pull request !135 from geruishi/master
 2020-12-11 13:24:03 +08:00