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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						a93b9a616f
					 | 
					
						
						
							
							售后日志优化
						
						
						
						
						
						
					 | 
					
						2023-06-19 10:19:29 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						cd4940d710
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-06-18 13:17:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a93acd2a74
					 | 
					
						
						
							
							mall + promotion:mock 秒杀列表
						
						
						
						
						
						
					 | 
					
						2023-06-18 02:05:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6573849f56
					 | 
					
						
						
							
							mall + promotion:mock 拼团列表
						
						
						
						
						
						
					 | 
					
						2023-06-18 00:35:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chenchen
							
						 
					 | 
					
						
						
							
						
						7d0e9ea762
					 | 
					
						
						
							
							fix 依赖启动问题
						
						
						
						
						
						
					 | 
					
						2023-06-17 23:47:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						60b24e36d5
					 | 
					
						
						
							
							code review:售后日志逻辑
						
						
						
						
						
						
					 | 
					
						2023-06-17 22:15:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						1871a01944
					 | 
					
						
						
							
							fix:seckill:调整相关类属性和表字段对齐
						
						
						
						
						
						
					 | 
					
						2023-06-17 22:14:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								陈賝
							
						 
					 | 
					
						
						
							
						
						59e16795be
					 | 
					
						
						
							
							!514 mall交易日志封装
						
						
						
						
						
						
						
						* 交易日志封装
* 交易日志封装
* 交易日志模块 
						
						
					 | 
					
						2023-06-17 14:00:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						35df912be7
					 | 
					
						
						
							
							code review:商品评价哈
						
						
						
						
						
						
					 | 
					
						2023-06-17 21:57:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						08535d6019
					 | 
					
						
						
							
							!509 完善商品评论
						
						
						
						
						
						
						
						Merge pull request !509 from puhui999/feature/mall_product 
						
						
					 | 
					
						2023-06-17 13:39:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						16f2a5b91a
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-06-17 21:19:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						32cca12cd2
					 | 
					
						
						
							
							fix:seckillTime => seckillConfig
						
						
						
						
						
						
					 | 
					
						2023-06-17 21:17:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0d47d6cead
					 | 
					
						
						
							
							mall + trade:code review 快递客户端的实现,没啥问题咧,搞下单测就 ok 拉
						
						
						
						
						
						
					 | 
					
						2023-06-17 11:59:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						59d5fef592
					 | 
					
						
						
							
							mall + trade:优化运费模版的代码
						
						
						
						
						
						
					 | 
					
						2023-06-17 11:35:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						07fe52939d
					 | 
					
						
						
							
							mall + promotion:mock banner mock 接口
						
						
						
						
						
						
					 | 
					
						2023-06-17 00:47:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5b324f90a4
					 | 
					
						
						
							
							mall + promotion:mock 拼团活动列表
						
						
						
						
						
						
					 | 
					
						2023-06-16 23:27:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8ec3733882
					 | 
					
						
						
							
							mall + trade:mock 拼团记录列表的接口
						
						
						
						
						
						
					 | 
					
						2023-06-16 20:32:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						af9334c9b2
					 | 
					
						
						
							
							mall + trade:mock 拼团记录详情的接口
						
						
						
						
						
						
					 | 
					
						2023-06-16 00:12:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						1662d17fc9
					 | 
					
						
						
							
							快递客户端 review 修改
						
						
						
						
						
						
					 | 
					
						2023-06-15 14:59:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jason
							
						 
					 | 
					
						
						
							
						
						e69e6d880b
					 | 
					
						
						
							
							快递价格计算 review 修改
						
						
						
						
						
						
					 | 
					
						2023-06-15 10:49:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |