|  Yangzw | daeb136873
							
							Merge branch 'dev/2024/0508/update-business-Y' of feifan/mall-backend-business into master | 1 anno fa | 
				
					
						|  Yangzw | ba1b71849e
							
							Merge branch 'master' of http://47.107.29.61:3000/feifan/mall-backend-business into dev/2024/0508/update-business-Y | 1 anno fa | 
				
					
						|  Yangzw | 5daefae73b
							
							Merge branch 'dev/2024/0508/update-business-Y' of Harper/feifan-backend-zx-business into master | 1 anno fa | 
				
					
						|  Yangzw | 0238e5a89f
							
							添加发货的订单订阅和推送 | 1 anno fa | 
				
					
						|  Yangzw | 9309d07161
							
							Merge branch 'dev/2024/0506/update-business-Y' of feifan/mall-backend-business into master | 1 anno fa | 
				
					
						|  Yangzw | a7057a6276
							
							Merge branch 'dev/2024/0506/update-business-Y' of Harper/feifan-backend-zx-business into master | 1 anno fa | 
				
					
						|  Yangzw | 8346cff6eb
							
							接通快递100查询物流信息 | 1 anno fa | 
				
					
						|  Yangzw | 13d7d7e693
							
							Merge branch 'dev/2024/0429/update-business' of Harper/feifan-backend-zx-business into master | 1 anno fa | 
				
					
						|  Yangzw | aa48267040
							
							修改商户下的添加商品缺失的merid | 1 anno fa | 
				
					
						|  Yangzw | c52c9eb37c
							
							Merge branch 'master' of http://10.0.5.229:10880/Harper/feifan-backend-zx-business into dev/2024/0429/update-business | 1 anno fa | 
				
					
						|  Yangzw | 96d040f490
							
							修改商户下的添加商品缺失的merid | 1 anno fa | 
				
					
						|  gaohp | 1a32247a20
							
							修改商户无法创建人员 | 1 anno fa | 
				
					
						|  gaohp | 0298f65a42
							
							更细商户端获取角色列表错误的问题 | 1 anno fa | 
				
					
						|  Ben | f23fda2b41
							
							修复商户退款失败问题。引入积分、身价相关类 | 1 anno fa | 
				
					
						|  Ben | 037c74b7c9
							
							Merge branch 'master' of http://47.107.29.61:8080/zx-mall/mall-backend-business | 1 anno fa | 
				
					
						|  Ben | 3d9ab6fca5
							
							修复商户退款失败问题。引入积分、身价相关类 | 1 anno fa | 
				
					
						|  Ben | b4658854c3
							
							Merge remote-tracking branch 'origin/master' | 1 anno fa | 
				
					
						|  Ben | f606737467
							
							Merge remote-tracking branch 'origin/dev/2024/04/24/update_refund_point' | 1 anno fa | 
				
					
						|  Yangzw | 6ba7411510
							
							Merge branch 'dev/2024/0424/update-business' into 'master' | 1 anno fa | 
				
					
						|  Yangzw | 18bc5943fb
							
							Merge branch 'dev/2024/0424/update-business' of Harper/feifan-backend-zx-business into master | 1 anno fa | 
				
					
						|  Yangzw | c6896a2715
							
							修改商户下的用户角色名称展示 | 1 anno fa | 
				
					
						|  Ben | 28da74fa31
							
							Merge branch 'master' of http://47.107.29.61:8080/zx-mall/mall-backend-business | 1 anno fa | 
				
					
						|  Ben | 764be0b574
							
							修复商户退款失败问题。引入积分、身价相关类 | 1 anno fa | 
				
					
						|  Ben | 49e336628c
							
							修复商户退款失败问题。引入积分、身价相关类 | 1 anno fa | 
				
					
						|  Yangzw | e2f9a50247
							
							Merge branch 'dev/2024/0420/update-business' into 'master' | 1 anno fa | 
				
					
						|  Yangzw | 8e7553eef4
							
							Merge branch 'dev/2024/0420/update-business' of Harper/feifan-backend-zx-business into master | 1 anno fa | 
				
					
						|  Yangzw | 4261caf787
							
							修改商品售后订单显示 | 1 anno fa | 
				
					
						|  Yangzw | 513305f1e9
							
							Merge branch 'dev/2024/0420/update-business' of Harper/feifan-backend-zx-business into master | 1 anno fa | 
				
					
						|  Yangzw | edede42175
							
							Merge branch 'dev/2024/0420/update-business' into 'master' | 1 anno fa | 
				
					
						|  Yangzw | b7e3472c95
							
							修改商品多规格没有shopId和merId | 1 anno fa |