luowenfeng
							
						 
					 | 
					
						
						
							
						
						edfe379848
					 | 
					
						
						
							
							feature(uniapp商品): 多规格新增
						
						
						
						
						
						
					 | 
					
						2022-08-23 21:06:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						8ad1439fda
					 | 
					
						
						
							
							feature(uniapp商品): 新增商品
						
						
						
						
						
						
					 | 
					
						2022-08-23 20:27:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						81666e3b62
					 | 
					
						
						
							
							mall:code review 商品的添加和修改 VO;微调商品的 SPU/SKU 表
						
						
						
						
						
						
					 | 
					
						2022-08-23 00:38:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						de27f4c2db
					 | 
					
						
						
							
							Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-08-18 22:39:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						07e5e1b59f
					 | 
					
						
						
							
							feature(管理后台): 商品弹窗
						
						
						
						
						
						
					 | 
					
						2022-08-18 22:38:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						405bf497ef
					 | 
					
						
						
							
							mall:新增 discount 限时折扣、reward 满减送
						
						
						
						
						
						
					 | 
					
						2022-08-17 01:10:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						96fc252348
					 | 
					
						
						
							
							mall:新增价格计算的接口
						
						
						
						
						
						
					 | 
					
						2022-08-16 09:17:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cfd0f3679f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-08-16 08:57:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5948be86a8
					 | 
					
						
						
							
							mall:新增价格计算的接口
						
						
						
						
						
						
					 | 
					
						2022-08-16 08:57:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wuxiran
							
						 
					 | 
					
						
						
							
						
						d505b64b8f
					 | 
					
						
						
							
							mall:还原
						
						
						
						
						
						
					 | 
					
						2022-08-16 00:38:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wuxiran
							
						 
					 | 
					
						
						
							
						
						c8ec5c8952
					 | 
					
						
						
							
							mall:上传enum类,做后端模板添加判定、前端页面添加
						
						
						
						
						
						
					 | 
					
						2022-08-16 00:26:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						515c0de78d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-08-12 00:04:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						00863fdbac
					 | 
					
						
						
							
							mall:调整 trade 订单的设计
						
						
						
						
						
						
					 | 
					
						2022-08-12 00:04:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wuxiran
							
						 
					 | 
					
						
						
							
						
						ac8f62a2be
					 | 
					
						
						
							
							mall:上传自动化生成的模板文件
						
						
						
						
						
						
					 | 
					
						2022-08-09 22:10:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wuxiran
							
						 
					 | 
					
						
						
							
						
						d2a9a49dad
					 | 
					
						
						
							
							mall:更新优惠券模板sql文件
						
						
						
						
						
						
					 | 
					
						2022-08-09 19:47:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wuxiran
							
						 
					 | 
					
						
						
							
						
						f0ee6467b3
					 | 
					
						
						
							
							mall:提交优惠券sql文件
						
						
						
						
						
						
					 | 
					
						2022-08-09 11:50:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						face9cae76
					 | 
					
						
						
							
							mall:调整 trade 的接口
						
						
						
						
						
						
					 | 
					
						2022-08-06 19:10:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						10caa6e824
					 | 
					
						
						
							
							fix(管理后台菜单): 控制台异常
						
						
						
						
						
						
					 | 
					
						2022-08-06 11:15: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
							
						 
					 | 
					
						
						
							
						
						fd4cf0c7f7
					 | 
					
						
						
							
							mall:优化订单表的设计
						
						
						
						
						
						
					 | 
					
						2022-08-03 23:48:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f5037015da
					 | 
					
						
						
							
							mall:优化 spu、sku 的表结构
						
						
						
						
						
						
					 | 
					
						2022-08-03 22:30:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						55bc9b0616
					 | 
					
						
						
							
							feature(uniapp商品): 全局函数
						
						
						
						
						
						
					 | 
					
						2022-08-03 15:55:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						75d2b9a19e
					 | 
					
						
						
							
							mall:同步最新 SQL
						
						
						
						
						
						
					 | 
					
						2022-08-01 23:02:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4ce76e82fc
					 | 
					
						
						
							
							mall:完善收件地址
						
						
						
						
						
						
					 | 
					
						2022-08-01 22:49:51 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2866b58741
					 | 
					
						
						
							
							1. 默认不开启 bpm 工作流模块,按需启动,提升启动速度
						
						
						
						
						
						
						
						2. 完整移除 activiti 遗留的东东 
						
						
					 | 
					
						2022-07-29 22:51:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d9aa0af158
					 | 
					
						
						
							
							完善 README 说明,补充更多演示图
						
						
						
						
						
						
					 | 
					
						2022-07-29 22:13:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4cd1b83822
					 | 
					
						
						
							
							完善 README 说明,补充更多演示图
						
						
						
						
						
						
					 | 
					
						2022-07-29 22:07:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4a8dba7001
					 | 
					
						
						
							
							增加「数据报表」的演示图
						
						
						
						
						
						
					 | 
					
						2022-07-29 21:46:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b05366511b
					 | 
					
						
						
							
							增加数据报表 vue
						
						
						
						
						
						
					 | 
					
						2022-07-29 21:11:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						39ac59efee
					 | 
					
						
						
							
							默认禁用报表模块,
						
						
						
						
						
						
					 | 
					
						2022-07-29 20:57:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						e46286d18a
					 | 
					
						
						
							
							!239 fix: redis7.0 监控查询calls数值过大转Intger异常
						
						
						
						
						
						
						
						Merge pull request !239 from lanyue52011/feature/visual 
						
						
					 | 
					
						2022-07-29 11:15:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						13c06cdbeb
					 | 
					
						
						
							
							!240 【支付模块】:接入支付宝【PC网站支付】
						
						
						
						
						
						
						
						Merge pull request !240 from gordon_xie/feature/alipay-pc 
						
						
					 | 
					
						2022-07-29 11:12:02 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xgd
							
						 
					 | 
					
						
						
							
						
						8c5681f4f9
					 | 
					
						
						
							
							[新增]接入支付宝【PC网站支付】
						
						
						
						
						
						
					 | 
					
						2022-07-29 17:31:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lanyue52011
							
						 
					 | 
					
						
						
							
						
						eb037c963c
					 | 
					
						
						
							
							fix: redis7.0 监控查询calls数值过大转Intger异常
						
						
						
						
						
						
					 | 
					
						2022-07-29 16:48:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |