xingyu4j
							
						 
					 | 
					
						
						
							
						
						120417b792
					 | 
					
						
						
							
							refactor: vxe crud
						
						
						
						
						
						
					 | 
					
						2022-11-13 13:16:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						89580e7903
					 | 
					
						
						
							
							合并 master 代码
						
						
						
						
						
						
					 | 
					
						2022-11-13 12:21:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						afc76973ce
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue 
						
						
					 | 
					
						2022-11-13 12:07:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						29cd9b79de
					 | 
					
						
						
							
							!299 refactor vue3 vxe crud
						
						
						
						
						
						
						
						Merge pull request !299 from xingyu/feature/vue3 
						
						
					 | 
					
						2022-11-13 03:49:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						85f83b9760
					 | 
					
						
						
							
							v3.8.4:修复table中更多按钮切换主题色未生效修复问题
						
						
						
						
						
						
					 | 
					
						2022-11-13 10:52:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2c43a72fcf
					 | 
					
						
						
							
							v3.8.4:修复主题颜色在Drawer组件不会加载问题(I5VCF0)去除某些svg图标的fill="#bfbfbf"属性,避免菜单激活无法修改其填充颜色。
						
						
						
						
						
						
					 | 
					
						2022-11-13 10:46:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						10d8607893
					 | 
					
						
						
							
							v3.8.4:修复主题颜色在Drawer组件不会加载问题(I5VCF0)
						
						
						
						
						
						
					 | 
					
						2022-11-13 10:44:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						803bd5e3c4
					 | 
					
						
						
							
							v3.8.4:修复多文件上传报错出现的异常问题
						
						
						
						
						
						
					 | 
					
						2022-11-13 10:40:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1a60d0ceb3
					 | 
					
						
						
							
							v3.8.4:优化页面内嵌iframe切换tab不刷新数据
						
						
						
						
						
						
					 | 
					
						2022-11-13 10:31:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1999ac4ea9
					 | 
					
						
						
							
							v3.8.4:修复图片预览组件src属性为null值控制台报错问题(I5KBAS)
						
						
						
						
						
						
					 | 
					
						2022-11-13 10:21:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						78f7e8a952
					 | 
					
						
						
							
							3.8.4:优化表格上右侧工具条(搜索按钮显隐&右侧样式凸出)
						
						
						
						
						
						
					 | 
					
						2022-11-13 10:14:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0e903df380
					 | 
					
						
						
							
							调整 YudaoDataPermissionAutoConfiguration 的自动配置
						
						
						
						
						
						
					 | 
					
						2022-11-13 10:06:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7cbd6cfb68
					 | 
					
						
						
							
							vue3:【menu】
						
						
						
						
						
						
						
						1. 添加 TODO 修改建议
2. 增加注释
3. 调整一些 import、const 的顺序 
						
						
					 | 
					
						2022-11-13 02:35:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						424520490d
					 | 
					
						
						
							
							vue3:【post】
						
						
						
						
						
						
						
						1. 添加 TODO 修改建议
2. 增加注释
3. 调整一些 import、const 的顺序 
						
						
					 | 
					
						2022-11-13 01:30:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						301b66d30e
					 | 
					
						
						
							
							refactor: notice
						
						
						
						
						
						
					 | 
					
						2022-11-12 23:33:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						f1445844bf
					 | 
					
						
						
							
							fix: menu
						
						
						
						
						
						
					 | 
					
						2022-11-12 23:00:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						f546fb5373
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/vue3
						
						
						
						
						
						
					 | 
					
						2022-11-12 22:54:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4807854df6
					 | 
					
						
						
							
							默认不引入 mall 模块,保证启动速度
						
						
						
						
						
						
					 | 
					
						2022-11-12 21:31:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1819e0e1d6
					 | 
					
						
						
							
							异步化 Redis MQ 的初始化,提升启动速度
						
						
						
						
						
						
					 | 
					
						2022-11-12 20:57:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c5b547e0f3
					 | 
					
						
						
							
							优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度
						
						
						
						
						
						
					 | 
					
						2022-11-12 20:22:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f5ef87094d
					 | 
					
						
						
							
							优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度
						
						
						
						
						
						
					 | 
					
						2022-11-12 20:17:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						92ace031fe
					 | 
					
						
						
							
							【修复】访问数据库存储的文件,path 多层级时,无法访问的问题
						
						
						
						
						
						
					 | 
					
						2022-11-12 19:37:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3310b766bc
					 | 
					
						
						
							
							【修复】工作流程-流程管理-流程模型,在发布完流程后,点击激活状态的按钮,显示“是否确认挂起流程名字为‘xxx’‘的数据项“,点击取消,前端显示的激活状态改变,但是数据库没有更新,报错
						
						
						
						
						
						
					 | 
					
						2022-11-12 19:09:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ff1379d454
					 | 
					
						
						
							
							优化 README 说明~
						
						
						
						
						
						
					 | 
					
						2022-11-12 18:57:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9e39356512
					 | 
					
						
						
							
							【修复】数据字典列表的 status 下拉无数据的情况
						
						
						
						
						
						
					 | 
					
						2022-11-12 17:39:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						199d3ebb69
					 | 
					
						
						
							
							perf: vxe
						
						
						
						
						
						
					 | 
					
						2022-11-12 17:33:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e4036842de
					 | 
					
						
						
							
							【修复】自定义 ICON 不生效的问题
						
						
						
						
						
						
					 | 
					
						2022-11-12 17:32:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						16b3e910e4
					 | 
					
						
						
							
							perf: vxe
						
						
						
						
						
						
					 | 
					
						2022-11-12 17:08:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						b1caa1a17b
					 | 
					
						
						
							
							perf: vxe
						
						
						
						
						
						
					 | 
					
						2022-11-12 16:52:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						ac47638249
					 | 
					
						
						
							
							perf: vxe
						
						
						
						
						
						
					 | 
					
						2022-11-12 16:46:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						725cc4e41b
					 | 
					
						
						
							
							perf: vxe
						
						
						
						
						
						
					 | 
					
						2022-11-12 15:52:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						94527ae9ae
					 | 
					
						
						
							
							init
						
						
						
						
						
						
					 | 
					
						2022-11-12 14:13:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e757d17202
					 | 
					
						
						
							
							【修复】swagger上传文件没有 file 参数
						
						
						
						
						
						
					 | 
					
						2022-11-12 13:46:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7093ed3997
					 | 
					
						
						
							
							【修复】钉钉登录时,重定向后 type 丢失导致报错的问题
						
						
						
						
						
						
					 | 
					
						2022-11-12 13:27:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3cd256f7f2
					 | 
					
						
						
							
							【修复】跨部门审核,当申请人与审批人不在同一部门,并且审批人的数据权限为“本部门数据权限”时,审批时有异常“手机号不存在”
						
						
						
						
						
						
					 | 
					
						2022-11-12 12:16:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1dfb37b11f
					 | 
					
						
						
							
							修复用户直接点击登录界面的三方登录,报“租户的请求未传递,请进行排查”的错误
						
						
						
						
						
						
					 | 
					
						2022-11-12 11:12:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c9f6494bb4
					 | 
					
						
						
							
							【优化】修改短信模板的渠道为云片时,校验 API 模板编号为整数
						
						
						
						
						
						
					 | 
					
						2022-11-12 11:01:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						ae0227c107
					 | 
					
						
						
							
							!276 阿里云OSS解析region时兼容带https的配置
						
						
						
						
						
						
						
						Merge pull request !276 from huangyemin/master 
						
						
					 | 
					
						2022-11-12 02:23:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a8cdf74120
					 | 
					
						
						
							
							【移除】Apollo 配置中心,简化学习成本
						
						
						
						
						
						
					 | 
					
						2022-11-12 09:52:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b3d8c503f5
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-11-12 09:15:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ce3aefadd7
					 | 
					
						
						
							
							移除 jasypt-spring-boot-starter 依赖,使用 hutool AES 替代
						
						
						
						
						
						
					 | 
					
						2022-11-12 09:15:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						356a8ec94d
					 | 
					
						
						
							
							!295 fix: vue3 bugs
						
						
						
						
						
						
						
						Merge pull request !295 from xingyu/feature/vue3 
						
						
					 | 
					
						2022-11-12 01:12:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3fbb0b4c54
					 | 
					
						
						
							
							修复滑块验证码,存在失败的情况
						
						
						
						
						
						
					 | 
					
						2022-11-11 20:47:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						93b8a2b6c1
					 | 
					
						
						
							
							1. 修复滑块验证码,存在失败的情况
						
						
						
						
						
						
						
						2. 重新构建 demo 预览项目 
						
						
					 | 
					
						2022-11-11 20:02:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						583549ed98
					 | 
					
						
						
							
							perf: message hooks
						
						
						
						
						
						
					 | 
					
						2022-11-11 10:21:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						775083e152
					 | 
					
						
						
							
							fix: axios
						
						
						
						
						
						
					 | 
					
						2022-11-11 10:15:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						fb237423b8
					 | 
					
						
						
							
							!294 修复单元测试报错
						
						
						
						
						
						
						
						Merge pull request !294 from 芋道源码/dev 
						
						
					 | 
					
						2022-11-11 01:22:17 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c51ab6ad73
					 | 
					
						
						
							
							优化 Vue3 SQL 导入脚本,避免误解
						
						
						
						
						
						
					 | 
					
						2022-11-11 09:09:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a539bc211d
					 | 
					
						
						
							
							1. 修复 MemberAuthServiceTest 单元测试
						
						
						
						
						
						
						
						2. 修复 DataPermissionDatabaseInterceptorTest 单元测试 
						
						
					 | 
					
						2022-11-11 08:55:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cb4224af12
					 | 
					
						
						
							
							1. 修复 FileServiceTest 单元测试
						
						
						
						
						
						
						
						2. 修复 FileConfigServiceImplTest 单元测试 
						
						
					 | 
					
						2022-11-11 08:48:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |