puhui999
							
						 
					 | 
					
						
						
							
						
						259807600a
					 | 
					
						
						
							
							feat:拼团订单集成
						
						
						
						
						
						
					 | 
					
						2023-07-21 16:47:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						147cd271b8
					 | 
					
						
						
							
							fix:完善拼团活动列表展示
						
						
						
						
						
						
					 | 
					
						2023-07-14 17:34:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						7cdb321fe4
					 | 
					
						
						
							
							fix:完善拼团活动CRUD
						
						
						
						
						
						
					 | 
					
						2023-07-14 17:08:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						e7d8643665
					 | 
					
						
						
							
							fix:修复 mall review @puhui999
						
						
						
						
						
						
					 | 
					
						2023-07-10 16:35:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b78f814552
					 | 
					
						
						
							
							fix:mall promotion SeckillActivity
						
						
						
						
						
						
					 | 
					
						2023-07-05 22:05:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						78b3d2a20f
					 | 
					
						
						
							
							fix:mall promotion Combination
						
						
						
						
						
						
					 | 
					
						2023-07-05 11:31:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						41d996f7f3
					 | 
					
						
						
							
							feat:mall promotion CombinationProduct
						
						
						
						
						
						
					 | 
					
						2023-07-04 11:21:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						409ec555e8
					 | 
					
						
						
							
							feat:mall CombinationActivity
						
						
						
						
						
						
					 | 
					
						2023-07-03 08:07:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ef656cf762
					 | 
					
						
						
							
							mall + promotion:
						
						
						
						
						
						
						
						1、增加获得符合条件的优惠劵 
						
						
					 | 
					
						2023-06-29 20:20:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						846405d8b1
					 | 
					
						
						
							
							mall + promotion:
						
						
						
						
						
						
						
						1、增加 article mock 接口 
						
						
					 | 
					
						2023-06-27 22:44:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7036a6652c
					 | 
					
						
						
							
							mall + member:
						
						
						
						
						
						
						
						1、调整收获地址的返回 
						
						
					 | 
					
						2023-06-26 20:07:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5c9a99c83e
					 | 
					
						
						
							
							mall + promotion:
						
						
						
						
						
						
						
						1、mock 优惠劵模版分页
2、mock 批量删除收藏 
						
						
					 | 
					
						2023-06-25 17:40:04 +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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						1871a01944
					 | 
					
						
						
							
							fix:seckill:调整相关类属性和表字段对齐
						
						
						
						
						
						
					 | 
					
						2023-06-17 22:14:23 +08: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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						af0eeb6e3b
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
					 | 
					
						2023-06-14 23:08:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b74991e242
					 | 
					
						
						
							
							mall + trade:mock 拼团活动详情的接口
						
						
						
						
						
						
					 | 
					
						2023-06-14 23:08:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						573ad59edc
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.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-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java 
						
						
					 | 
					
						2023-06-14 15:18:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b6c7a940be
					 | 
					
						
						
							
							mall + promotion:增加秒杀活动的 mock 接口
						
						
						
						
						
						
					 | 
					
						2023-06-11 23:19:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |