YunaiV
							
						 
					 | 
					
						
						
							
						
						a11dd1be28
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						# Conflicts:
#	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/service/sku/ProductSkuServiceImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java 
						
						
					 | 
					
						2022-08-23 00:37:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f03d679f2c
					 | 
					
						
						
							
							mall:code review 商品的添加和修改 VO;微调商品的 SPU/SKU 表
						
						
						
						
						
						
					 | 
					
						2022-08-23 00:33:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						8de29d302c
					 | 
					
						
						
							
							feature(uniapp商品): 新增商品数据
						
						
						
						
						
						
					 | 
					
						2022-08-22 21:20:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						617573a59b
					 | 
					
						
						
							
							feature(uniapp分类): 商品创建功能以及查询功能正常使用
						
						
						
						
						
						
					 | 
					
						2022-08-22 20:43:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						face9cae76
					 | 
					
						
						
							
							mall:调整 trade 的接口
						
						
						
						
						
						
					 | 
					
						2022-08-06 19:10:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cfde3dcacb
					 | 
					
						
						
							
							mall:优化订单表的设计
						
						
						
						
						
						
					 | 
					
						2022-08-05 00:28:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						33a01e78bf
					 | 
					
						
						
							
							mall:优化商品表的设计
						
						
						
						
						
						
					 | 
					
						2022-08-04 23:25:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c612487198
					 | 
					
						
						
							
							mall:优化订单表的设计
						
						
						
						
						
						
					 | 
					
						2022-08-04 20:39:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f5037015da
					 | 
					
						
						
							
							mall:优化 spu、sku 的表结构
						
						
						
						
						
						
					 | 
					
						2022-08-03 22:30:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4ce76e82fc
					 | 
					
						
						
							
							mall:完善收件地址
						
						
						
						
						
						
					 | 
					
						2022-08-01 22:49:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zy
							
						 
					 | 
					
						
						
							
						
						7a164ecdff
					 | 
					
						
						
							
							fix:打开系统接口,控制台报错
						
						
						
						
						
						
					 | 
					
						2022-08-01 14:54:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						96e2a27d07
					 | 
					
						
						
							
							mall:初始化 trade 表结构
						
						
						
						
						
						
					 | 
					
						2022-08-01 00:53:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2b71a1588c
					 | 
					
						
						
							
							mall:初始化 trade 交易模块
						
						
						
						
						
						
					 | 
					
						2022-07-31 22:36:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						022e5b8519
					 | 
					
						
						
							
							mall:完善商品模块的表设计
						
						
						
						
						
						
					 | 
					
						2022-07-31 22:26:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9577f9b17d
					 | 
					
						
						
							
							mall:调整部分 Spu、Sku、Property、Group、Shop 的表设计
						
						
						
						
						
						
					 | 
					
						2022-07-31 13:13:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2340f09c68
					 | 
					
						
						
							
							mall:调整部分 SPU、SKU 的表设计
						
						
						
						
						
						
					 | 
					
						2022-07-31 02:19:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fa9823161e
					 | 
					
						
						
							
							mall:完善商品品牌的前后端实现
						
						
						
						
						
						
					 | 
					
						2022-07-30 22:15:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						efd4942129
					 | 
					
						
						
							
							mall:完善商品分类的 APP 后端接口
						
						
						
						
						
						
					 | 
					
						2022-07-30 21:24:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						969c387764
					 | 
					
						
						
							
							mall:完善商品分类的管理后台界面
						
						
						
						
						
						
					 | 
					
						2022-07-30 20:28:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6a0f713452
					 | 
					
						
						
							
							mall:完善商品分类的后端接口
						
						
						
						
						
						
					 | 
					
						2022-07-30 19:37:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1976571ae8
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-ui-admin/src/views/mall/product/spu/index.vue 
						
						
					 | 
					
						2022-07-29 23:44:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						af6a022450
					 | 
					
						
						
							
							feature(uniapp商品): 商品详情
						
						
						
						
						
						
					 | 
					
						2022-07-27 16:04:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						f84f3a3631
					 | 
					
						
						
							
							refactor: 时间区间查询传入数组-测试模块
						
						
						
						
						
						
					 | 
					
						2022-07-22 10:24:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						dad10d858a
					 | 
					
						
						
							
							refactor: 时间区间查询传入数组
						
						
						
						
						
						
					 | 
					
						2022-07-21 23:22:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						e2a6530acb
					 | 
					
						
						
							
							feature(uniapp分类): 分类列表以及商品加载
						
						
						
						
						
						
					 | 
					
						2022-07-11 12:05:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						be370ba2cf
					 | 
					
						
						
							
							spu 修改调整,组合分类和规格属性,方便前端修改的回显展示
						
						
						
						
						
						
					 | 
					
						2022-07-05 22:33:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						1bc812fd05
					 | 
					
						
						
							
							spu 查询分类展示
						
						
						
						
						
						
					 | 
					
						2022-07-05 17:30:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						abbfbd5f25
					 | 
					
						
						
							
							code review:商品 spu、sku 的逻辑
						
						
						
						
						
						
					 | 
					
						2022-06-11 11:36:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						407cbb109f
					 | 
					
						
						
							
							spu 调整一波
						
						
						
						
						
						
					 | 
					
						2022-06-08 18:38:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky-mgmg-pc
							
						 
					 | 
					
						
						
							
						
						2382ddfb37
					 | 
					
						
						
							
							spu sku review调整一波
						
						
						
						
						
						
					 | 
					
						2022-06-07 18:04:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky-mgmg-pc
							
						 
					 | 
					
						
						
							
						
						c118d8198b
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java 
						
						
					 | 
					
						2022-06-07 17:18:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky-mgmg-pc
							
						 
					 | 
					
						
						
							
						
						4bcc6c374e
					 | 
					
						
						
							
							spu 保存,propertyValue合并到productProperty中
						
						
						
						
						
						
					 | 
					
						2022-06-07 17:16:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						766afbacbf
					 | 
					
						
						
							
							code review:商品 spu、sku 的逻辑
						
						
						
						
						
						
					 | 
					
						2022-06-07 00:32:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						f07bf8b0fd
					 | 
					
						
						
							
							spu保存校验添加
						
						
						
						
						
						
					 | 
					
						2022-06-05 22:43:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						6dca8e082b
					 | 
					
						
						
							
							商品调整
						
						
						
						
						
						
					 | 
					
						2022-06-05 15:45:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						eb5bdda344
					 | 
					
						
						
							
							SPU名字重构
						
						
						
						
						
						
					 | 
					
						2022-05-31 18:39:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shuaidawang
							
						 
					 | 
					
						
						
							
						
						493b139590
					 | 
					
						
						
							
							重命名增加Product前缀
						
						
						
						
						
						
					 | 
					
						2022-05-19 18:07:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shuaidawang
							
						 
					 | 
					
						
						
							
						
						204a5ba284
					 | 
					
						
						
							
							规格增删改查接口及页面提交
						
						
						
						
						
						
					 | 
					
						2022-05-19 17:25:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shuaidawang
							
						 
					 | 
					
						
						
							
						
						a270db821d
					 | 
					
						
						
							
							规格加个枚举,去掉TODO
						
						
						
						
						
						
					 | 
					
						2022-05-19 14:43:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shuaidawang
							
						 
					 | 
					
						
						
							
						
						733a3c4615
					 | 
					
						
						
							
							商品规格实体类增加Product前缀
						
						
						
						
						
						
					 | 
					
						2022-05-19 14:39:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9dad9e555f
					 | 
					
						
						
							
							code review 商品模块的表结构与模块划分
						
						
						
						
						
						
					 | 
					
						2022-05-18 19:35:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						a86cbde090
					 | 
					
						
						
							
							商品spu和sku测试类调整
						
						
						
						
						
						
					 | 
					
						2022-05-18 14:47:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						e314f4aaeb
					 | 
					
						
						
							
							商品规格属性代码生成
						
						
						
						
						
						
					 | 
					
						2022-05-18 14:42:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						2bbfa40265
					 | 
					
						
						
							
							调整商品代码生成模块
						
						
						
						
						
						
					 | 
					
						2022-05-17 22:16:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						279127298b
					 | 
					
						
						
							
							spu和sku 自动代码生成
						
						
						
						
						
						
					 | 
					
						2022-05-17 21:12:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						9f9004624b
					 | 
					
						
						
							
							商品规格属性代码生成
						
						
						
						
						
						
					 | 
					
						2022-05-15 22:55:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						0d017e4b1c
					 | 
					
						
						
							
							fix: 删除品牌和分类的无用接口
						
						
						
						
						
						
					 | 
					
						2022-05-12 17:21:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						d9d473dcf0
					 | 
					
						
						
							
							fix: TODO 分类合理性
						
						
						
						
						
						
					 | 
					
						2022-05-12 17:09:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						ff307a4c86
					 | 
					
						
						
							
							fix: TODO pid 改成 parentId 字段
						
						
						
						
						
						
					 | 
					
						2022-05-12 16:57:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e6893db1c3
					 | 
					
						
						
							
							uniapp:code review 商品分类、商品品牌
						
						
						
						
						
						
					 | 
					
						2022-05-05 00:52:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |