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

672 Commits

Author SHA1 Message Date
RuoYi df504c5c14 修复四级菜单无法显示问题 2021-02-06 09:29:50 +08:00
疯狂的狮子li 6f0dfa850a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/system/role/index.vue
 2021-02-03 13:38:43 +08:00
RuoYi baeed2e8d3 修复角色管理-编辑角色-功能权限显示异常 2021-02-02 16:25:37 +08:00
疯狂的狮子li 8ba1266b6a 修改 页面生成模板 适配后端时间格式 2021-01-28 09:22:25 +08:00
疯狂的狮子li 118c02144f 集成 Feign 接口化管理 Http请求(如短信,支付,推送等) 2021-01-27 15:15:03 +08:00
疯狂的狮子li a4756004f8 删除过时配置 2021-01-27 13:10:05 +08:00
疯狂的狮子li 6e6933bb25 支持树表生成 增加生成树表说明 2021-01-25 13:35:07 +08:00
疯狂的狮子li 2925f28255 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
 2021-01-25 09:54:49 +08:00
RuoYi 2903de1561 升级element-ui到最新版本2.15.0 2021-01-24 12:06:19 +08:00
疯狂的狮子li b5e8fa2b98 统一校验配置类名称 2021-01-21 09:31:37 +08:00
疯狂的狮子li 09acac4caf 更新readme 2021-01-18 16:13:05 +08:00
疯狂的狮子li 9fdee373af 删除多余注解(@Data已包含) 2021-01-18 14:00:03 +08:00
疯狂的狮子li 3362ce5f33 升级 MybatisPlus 3.4.2 2021-01-15 15:55:24 +08:00
疯狂的狮子li 52325307f4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	README.md
 2021-01-15 15:08:50 +08:00
RuoYi cca2f5c62d update README.md 2021-01-14 13:20:08 +08:00
RuoYi ce54416e4f 升级fastjson到最新版1.2.75 2021-01-13 16:20:39 +08:00
RuoYi bd19892aff 修复生成树表代码异常 2021-01-13 16:19:23 +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
若依 f3cb18c836 !161 修复导入数据为负浮点数时，导入结果会丢失精度问题 
Merge pull request !161 from 嘿白熊/master
 2021-01-08 10:46:36 +08:00
RuoYi 7d0eb3b8c7 用户显隐列添加不同key防止被复用 2021-01-07 13:28:16 +08:00
RuoYi 654aa6b30c 表格右侧工具栏组件支持显隐列 2021-01-06 17:30:39 +08:00
X.B-H b7cdd10f9f 修复导入数据为负浮点数时丢失精度问题 2021-01-06 11:11:11 +08:00
RuoYi 9bd35cb7be 升级druid到最新版本v1.2.4 2021-01-06 11:00:20 +08:00
RuoYi 7a86c714fc 代码生成支持文件上传组件 2021-01-06 11:00:09 +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 3cd886785b 图片组件添加预览功能 2021-01-05 20:33:41 +08:00
RuoYi ae5a0f9774 新增文件上传组件 2021-01-05 20:11:09 +08:00
RuoYi 074b3c735d 设置单图上传控件 2021-01-05 16:17:41 +08:00
RuoYi a118738d0f 单图上传组件添加移除 2021-01-05 16:13:22 +08:00
RuoYi 56fa3912ae 修复IE11浏览器报错问题 2021-01-05 09:44:08 +08:00
疯狂的狮子li d73994f05d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/online/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-01-05 09:22:36 +08:00
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