lhm
							
						 | 
						
							
							
								429b82e1b8
							
							修改积分分摊最后一个商品计算方式
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								be12dd0f4e
							
							统一设置最大积分抵扣比例,新增积分抵扣是否参与逻辑
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								1a228135d8
							
							统一设置多少积分抵扣一元
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								1c2dddeb6b
							
							fix:前端bug
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								2540fad620
							
							fix:重新计算活动价
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								cb000a12c9
							
							配置修改
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								bfdebce68c
							
							Merge branch 'master' of http://git.ds-bay.com/project/kmall-haikong
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								1d10cf00d8
							
							fix:收银端总价显示bug
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								6a6d2bb155
							
							Merge branch 'master' of zhh/kmall-haikong into master
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   钱能归
							
						 | 
						
							
							
								5edff613cb
							
							Merge branch 'feature/管理端bug修复1211' of qng/kmall-haikong into master
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								d5d23ae0f2
							
							Merge remote-tracking branch 'origin/master' into feature/管理端bug修复1211
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								b158af3b8e
							
							bug修复
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   zhh
							
						 | 
						
							
							
								b7836bcde2
							
							修复页面bug
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   zhh
							
						 | 
						
							
							
								25ec21f771
							
							Merge remote-tracking branch 'upsteam/master'
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   zhh
							
						 | 
						
							
							
								8234bb1fc1
							
							商品规格增加查询条件
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								7771f82e00
							
							Merge branch 'master' of lhm/kmall-haikong into master
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								928bcb0d11
							
							活动相关bug修复
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   zhh
							
						 | 
						
							
							
								1e8b57f133
							
							修复打印小票码信息
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   zhh
							
						 | 
						
							
							
								808b1baad9
							
							Merge remote-tracking branch 'upsteam/master'
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								5a213ebf00
							
							bug修复
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								4edcbb9773
							
							Merge branch 'master' of http://git.ds-bay.com/project/kmall-haikong into feature/test
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   lhm
							
						 | 
						
							
							
								33e32a4eb6
							
							活动相关bug修复,订单详情新增积分抵扣数量、积分抵扣金额
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								56ca844d83
							
							bug修复
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   钱能归
							
						 | 
						
							
							
								f16d55f8b3
							
							Merge branch 'feature/管理端bug修复1211' of qng/kmall-haikong into master
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								a8f913ecc2
							
							bug修复
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   zhh
							
						 | 
						
							
							
								4e0c59376a
							
							修复页面bug
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   zhh
							
						 | 
						
							
							
								7b4a7e30bb
							
							商品类型页面优化和修复bug
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   zhh
							
						 | 
						
							
							
								c82fc12ddb
							
							Merge remote-tracking branch 'upsteam/master'
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   钱能归
							
						 | 
						
							
							
								e0a8c935fa
							
							Merge branch 'feature/系统日志前端优化1210' of qng/kmall-haikong into master
						 | 
						%!s(int64=3) %!d(string=hai) anos | 
					
				
					
						
							
								   qng
							
						 | 
						
							
							
								3e5c236ccc
							
							Merge remote-tracking branch 'origin/master' into feature/系统日志前端优化1210
						 | 
						%!s(int64=3) %!d(string=hai) anos |