lhm
							
						 | 
						
							
							
								0f395cd340
							
							Merge branch 'feature/haikong-20211122' of http://git.ds-bay.com/project/kmall-haikong into feature/haikong-20211122
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								d34791a1ad
							
							活动代码相关提交
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								108a917d31
							
							Merge branch 'feature/退款功能21-1120-qng' into feature/haikong-20211122
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								89969d53e6
							
							退款改造1120
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								f2de00dcb7
							
							收银端新增会员码提交
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								c7e54d5f39
							
							重写收银端商品数量改变逻辑,新增BigNumber计算工具类
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								bccdc14b33
							
							Merge remote-tracking branch 'upstream/featrue/海控项目1115-qng' into feature/haikong-20211120
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								87b7c994e3
							
							Merge remote-tracking branch 'origin/featrue/海控项目1115-qng' into feature/haikong-20211120
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								abfd774880
							
							活动相关
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								d5c0f895e0
							
							退款改造
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								efe221abcd
							
							积分规则设置以及免税mall接口对接
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								c0dc4b2ab3
							
							积分规则设置1116
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								68d9c38c9b
							
							下单流程优化(判断库存),新增junit单元测试
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								2ed04850e8
							
							完善海控仓库对接
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								ebfa091751
							
							Merge branch 'feature/海控项目改造1028-qng' into featrue/海控项目1115-qng
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								01c2355768
							
							退款库存扣取逻辑调整
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								f1f865720f
							
							海控相关对接逻辑:
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								a01425a0d4
							
							Merge branch 'feature/海控项目改造1028-qng'
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								11b5de925e
							
							前端改造
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								96c94b7ebd
							
							添加日志、注释
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								8d80220db9
							
							海控会员系统对接
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								df602e25b8
							
							数据库配置文件修改
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								cd27f88d7e
							
							项目名修改
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								a8cfb9914c
							
							Init Repository
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								4040afed6a
							
							redis配置修改
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								26008a0cca
							
							Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   杨波
							
						 | 
						
							
							
								3f2de38a14
							
							Merge branch 'feature/收银端扫描商品增加上架条件211012' of qng/kmall-pt-general into master
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								3b95fbf094
							
							收银端扫描商品增加上架条件
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								1c659d2db0
							
							Merge remote-tracking branch 'origin/future/园区库存'
						 | 
						4 gadi atpakaļ | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								e65b1ac8e3
							
							Merge remote-tracking branch 'origin/future/查验单还原库存'
						 | 
						4 gadi atpakaļ |