xingyu
							
						 
					 | 
					
						
						
							
						
						7ad3b6ad2b
					 | 
					
						
						
							
							chore: use com.xingyuv.justauth
						
						
						
						
						
						
					 | 
					
						2023-06-26 21:08:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7036a6652c
					 | 
					
						
						
							
							mall + member:
						
						
						
						
						
						
						
						1、调整收获地址的返回 
						
						
					 | 
					
						2023-06-26 20:07:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						8ea46b8fc2
					 | 
					
						
						
							
							fix: getNewPhoneNoInfo 已过期
						
						
						
						
						
						
					 | 
					
						2023-06-26 16:53:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						9826bd614b
					 | 
					
						
						
							
							docs: up Lombok 1.18.28
						
						
						
						
						
						
					 | 
					
						2023-06-26 16:50:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						c1782c432f
					 | 
					
						
						
							
							chore: up deps version
						
						
						
						
						
						
					 | 
					
						2023-06-26 16:50:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						d44c29296d
					 | 
					
						
						
							
							chore: up hutool 5.8.20 Lombok 1.18.28
						
						
						
						
						
						
					 | 
					
						2023-06-26 16:49:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						4393c5da1c
					 | 
					
						
						
							
							docs: up Druid 1.2.18
						
						
						
						
						
						
					 | 
					
						2023-06-26 16:30:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						02fe0329e4
					 | 
					
						
						
							
							chore: up druid 1.2.18
						
						
						
						
						
						
					 | 
					
						2023-06-26 16:29:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0899f5fd29
					 | 
					
						
						
							
							docs: up springboot 2.10.12
						
						
						
						
						
						
					 | 
					
						2023-06-26 16:27:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						bdb18b4ced
					 | 
					
						
						
							
							chore: up springboot 2.7.13
						
						
						
						
						
						
					 | 
					
						2023-06-26 16:26:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5c9a99c83e
					 | 
					
						
						
							
							mall + promotion:
						
						
						
						
						
						
						
						1、mock 优惠劵模版分页
2、mock 批量删除收藏 
						
						
					 | 
					
						2023-06-25 17:40:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						e5c556f106
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-06-25 15:49:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bb0bb2a4fa
					 | 
					
						
						
							
							mall + promotion:商品列表
						
						
						
						
						
						
					 | 
					
						2023-06-25 11:25:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4a3703e302
					 | 
					
						
						
							
							mall + promotion:review 页面装修
						
						
						
						
						
						
					 | 
					
						2023-06-25 11:24:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						050f0bb6a2
					 | 
					
						
						
							
							页面装修 review 修改
						
						
						
						
						
						
					 | 
					
						2023-06-24 21:09:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b582206003
					 | 
					
						
						
							
							mall + promotion:review 页面装修
						
						
						
						
						
						
					 | 
					
						2023-06-24 12:54:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						ad1f656dfa
					 | 
					
						
						
							
							页面装修修改,后端只负责存取
						
						
						
						
						
						
					 | 
					
						2023-06-24 00:11:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1dfbe45913
					 | 
					
						
						
							
							mall + order:review 售后日志
						
						
						
						
						
						
					 | 
					
						2023-06-23 21:50:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						07884ef423
					 | 
					
						
						
							
							Merge branch 'mall_trade_aftersalelog' of https://gitee.com/chen934298133/ruoyi-vue-pro into feature/mall_product
						
						
						
						
						
						
						
						 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppTradeAfterSaleCreateReqVO.java 
						
						
					 | 
					
						2023-06-23 21:37:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bc54e2fb35
					 | 
					
						
						
							
							mall + order:订单详情
						
						
						
						
						
						
					 | 
					
						2023-06-23 21:34:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						b92ed60136
					 | 
					
						
						
							
							!519 订单详情后端修改
						
						
						
						
						
						
						
						Merge pull request !519 from 矿泉水/feature/mall_product 
						
						
					 | 
					
						2023-06-23 13:30:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2efdbf93cb
					 | 
					
						
						
							
							mall + promotion:review 秒杀、评论代码
						
						
						
						
						
						
					 | 
					
						2023-06-23 21:14:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						b16632ea41
					 | 
					
						
						
							
							!522 mall seckill
						
						
						
						
						
						
						
						Merge pull request !522 from puhui999/feature/mall_product 
						
						
					 | 
					
						2023-06-23 06:04:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						6b1d996b66
					 | 
					
						
						
							
							页面装修数据结构定义
						
						
						
						
						
						
					 | 
					
						2023-06-23 10:53:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						26f563df57
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-06-23 00:57:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ab30ff6480
					 | 
					
						
						
							
							fix:完善 mall seckill 相关 ②
						
						
						
						
						
						
					 | 
					
						2023-06-23 00:57:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b0fcd96dfe
					 | 
					
						
						
							
							mall + promotion:增加砍价记录的 mock
						
						
						
						
						
						
					 | 
					
						2023-06-23 00:26:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f5b2bb4d7d
					 | 
					
						
						
							
							mall + promotion:增加砍价记录的 mock
						
						
						
						
						
						
					 | 
					
						2023-06-22 23:06:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c33bd38b5d
					 | 
					
						
						
							
							mall + promotion:增加砍价记录的 mock
						
						
						
						
						
						
					 | 
					
						2023-06-21 23:45:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b44ad3a0f7
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-06-21 08:42:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						666925da6e
					 | 
					
						
						
							
							fix:mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED
						
						
						
						
						
						
					 | 
					
						2023-06-21 08:41:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						772a982b5f
					 | 
					
						
						
							
							mall + promotion:增加拼团记录的 mock
						
						
						
						
						
						
					 | 
					
						2023-06-21 00:29:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						700d95a43d
					 | 
					
						
						
							
							fix:完善商品评论 review 提到的问题
						
						
						
						
						
						
					 | 
					
						2023-06-20 18:12:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						8dfb298376
					 | 
					
						
						
							
							fix:完善 mall seckill 相关 ①
						
						
						
						
						
						
					 | 
					
						2023-06-20 09:08:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						9517ffdfb8
					 | 
					
						
						
							
							fix:修复 mall product promotion 测试 sql
						
						
						
						
						
						
					 | 
					
						2023-06-20 09:06:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bf7f68a04b
					 | 
					
						
						
							
							mall + promotion:增加拼团的 mock 返回
						
						
						
						
						
						
					 | 
					
						2023-06-19 23:35:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8a7f7fd641
					 | 
					
						
						
							
							mall + promotion:增加拼团的 mock 返回
						
						
						
						
						
						
					 | 
					
						2023-06-19 20:35:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chenchen
							
						 
					 | 
					
						
						
							
						
						2f0aaee823
					 | 
					
						
						
							
							售后日志优化
						
						
						
						
						
						
					 | 
					
						2023-06-19 17:04:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaobai
							
						 
					 | 
					
						
						
							
						
						d6bd4be8b0
					 | 
					
						
						
							
							''
						
						
						
						
						
						
					 | 
					
						2023-06-19 13:10:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaobai
							
						 
					 | 
					
						
						
							
						
						32b348a2d3
					 | 
					
						
						
							
							Merge branch 'feature/mall_product' of https://gitee.com/joly_xiaobai/ruoyi-vue-pro into mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java 
						
						
					 | 
					
						2023-06-19 13:06:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaobai
							
						 
					 | 
					
						
						
							
						
						6b3af71735
					 | 
					
						
						
							
							订单详情修改20230619
						
						
						
						
						
						
					 | 
					
						2023-06-19 12:50:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chenchen
							
						 
					 | 
					
						
						
							
						
						b7c0fef63f
					 | 
					
						
						
							
							Merge branch 'feature/mall_product' into mall_product_aftersalelog
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml
#	yudao-module-mall/yudao-module-trade-biz/pom.xml
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
#	yudao-server/pom.xml 
						
						
					 | 
					
						2023-06-19 10:22:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chenchen
							
						 
					 | 
					
						
						
							
						
						2672b3e2fa
					 | 
					
						
						
							
							fix 依赖启动问题
						
						
						
						
						
						
					 | 
					
						2023-06-19 10:19:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chenchen
							
						 
					 | 
					
						
						
							
						
						a93b9a616f
					 | 
					
						
						
							
							售后日志优化
						
						
						
						
						
						
					 | 
					
						2023-06-19 10:19:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						7fc1016e90
					 | 
					
						
						
							
							chore: up captcha-plus 1.0.4
						
						
						
						
						
						
					 | 
					
						2023-06-19 09:47:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						850d028ec7
					 | 
					
						
						
							
							chore: 添加华为云maven aliyun同步速度慢
						
						
						
						
						
						
					 | 
					
						2023-06-19 09:47:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						331be53b8b
					 | 
					
						
						
							
							fix:完善时段配置管理
						
						
						
						
						
						
					 | 
					
						2023-06-19 08:58:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						49d726019a
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-06-19 08:33:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fc570b6062
					 | 
					
						
						
							
							mall + promotion:完善秒杀活动的 mock 返回
						
						
						
						
						
						
					 | 
					
						2023-06-18 21:23:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d795dbc7ac
					 | 
					
						
						
							
							mall + promotion:优化限购、库存的返回结果
						
						
						
						
						
						
					 | 
					
						2023-06-18 20:15:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |