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

1215 Commits

Author SHA1 Message Date
疯狂的狮子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
RuoYi cc50224d90 固定顶部导航栏&窗口大小改变实时更新栏数 2021-04-14 11:01:16 +08:00
RuoYi ff09e1cf55 数据监控默认地址修改 2021-04-13 18:15:11 +08:00
疯狂的狮子li 876a06a9cd update mp化 2021-04-13 17:14:50 +08:00
疯狂的狮子li 20d40ea691 update mp化 2021-04-13 15:29:05 +08:00
RuoYi fe2ccbdc1b 优化代码生成导出模板名称 2021-04-13 14:49:42 +08:00
RuoYi c8df1f5e1f 布局设置支持保存&重置配置 2021-04-13 09:47:28 +08:00
RuoYi e71c00e6fa 富文本编辑器支持自定义上传地址 2021-04-13 09:38:32 +08:00
若依 dcb9839596 !209 导出 Excel 工作表的名称 由 ${businessName} 更改为 ${functionName} 
Merge pull request !209 from lihy2021/N/A
 2021-04-13 09:36:49 +08:00
若依 f13b6d92d2 !205 富文本编辑器自定义上传地址 
Merge pull request !205 from hechieh/N/A
 2021-04-13 09:36:42 +08:00
疯狂的狮子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
lihy2021 6595c68df1 导出 Excel 工作表的名称 由 ${businessName} 更改为 ${functionName} 2021-04-12 14:52:14 +08:00
Ricky 5a2a0c09b6 优化主子表代码生成 2021-04-12 13:26:54 +08:00
疯狂的狮子li d48946ab90 fix bo缺包问题 2021-04-12 10:34:50 +08:00
RuoYi 9aac65ff32 新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单） 2021-04-12 09:54:08 +08:00
RuoYi 5f2350569a 页签新增关闭右侧 2021-04-10 21:15:45 +08:00
hechieh ccf05b697d 富文本编辑器自定义上传地址 2021-04-10 17:08:49 +08:00
疯狂的狮子li 88841ac01f update Date参数接收Bo实体格式转换 2021-04-09 11:47:51 +08:00
RuoYi 6810243ab7 修复树表数据显示不全&加载慢问题 2021-04-09 08:31:13 +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