|  gaohp | efe0e5fdde
							
							Merge branch 'master' of http://47.107.29.61:8080/zx-mall/mall-backend-admin | 1 éve | 
				
					
						|  Yangzw | 997ec4e18d
							
							Merge branch 'dev/2024/0425/update-admin' into 'master' | 1 éve | 
				
					
						|  Yangzw | 20cc74a9c1
							
							Merge branch 'dev/2024/0425/update-admin' of Harper/feifan-backend-zx-admin into master | 1 éve | 
				
					
						|  Yangzw | b82faa2d16
							
							更新合赢奖的计算 | 1 éve | 
				
					
						|  gaohp | 3a116e3c86
							
							修改更新获取用户的角色错误的问题 | 1 éve | 
				
					
						|  Yangzw | e28777ce71
							
							Merge branch 'dev/2024/0425/update-admin' into 'master' | 1 éve | 
				
					
						|  Yangzw | 617b33c603
							
							Merge branch 'dev/2024/0425/update-admin' of Harper/feifan-backend-zx-admin into master | 1 éve | 
				
					
						|  Yangzw | 58fe7f36d7
							
							修改店铺订单显示异常 | 1 éve | 
				
					
						|  Ben | 1b85fa056f
							
							Merge remote-tracking branch 'origin/master' | 1 éve | 
				
					
						|  Ben | c8c9a495c2
							
							修改建数据库SQL | 1 éve | 
				
					
						|  gaohp | 2b34bb30cc
							
							修改获取订单的方式 | 1 éve | 
				
					
						|  Yangzw | eeb0eb7f72
							
							Merge branch 'dev/2024/0424/update-admin' into 'master' | 1 éve | 
				
					
						|  Yangzw | 9dadeae33a
							
							Merge branch 'dev/2024/0424/update-admin' of Harper/feifan-backend-zx-admin into master | 1 éve | 
				
					
						|  Yangzw | 8544db4e99
							
							添加用户的详情信息 | 1 éve | 
				
					
						|  Yangzw | c0fb4532d4
							
							Merge branch 'dev/2024/0424/update-admin' of Harper/feifan-backend-zx-admin into master | 1 éve | 
				
					
						|  Yangzw | c2e423e777
							
							Merge branch 'dev/2024/0424/update-admin' into 'master' | 1 éve | 
				
					
						|  Yangzw | 0c1dacb93c
							
							修改碰撞记录和创建当日碰撞统计 | 1 éve | 
				
					
						|  gaohp | 8e576d291e
							
							修改订单计算 | 1 éve | 
				
					
						|  Ben | 719a8ee979
							
							Merge remote-tracking branch 'origin/master' | 1 éve | 
				
					
						|  Ben | 83e3d9a5ca
							
							修改建数据库SQL | 1 éve | 
				
					
						|  Harper | 98310bb149
							
							修改碰撞表 | 1 éve | 
				
					
						|  Harper | 92b624e542
							
							Merge branch 'master' of http://47.107.29.61:8080/zx-mall/mall-backend-admin | 1 éve | 
				
					
						|  Harper | 824009cc6b
							
							修改获取分销人员关系树的代码, 去除所有深度不为1的数据 | 1 éve | 
				
					
						|  gaohp | 0f0fa56159
							
							修改合赢奖计算, 修改营销数据计算 | 1 éve | 
				
					
						|  Yangzw | d3f6f77a66
							
							Merge branch 'dev/2024/0423/update-admin' into 'master' | 1 éve | 
				
					
						|  Yangzw | 2913663ff1
							
							Merge branch 'dev/2024/0423/update-admin' of Harper/feifan-backend-zx-admin into master | 1 éve | 
				
					
						|  Yangzw | 8d0e51dd6a
							
							修改营销模块的字段改成Long类型 | 1 éve | 
				
					
						|  Yangzw | 38bac26c53
							
							Merge branch 'dev/2024/0422/update-admin' into 'master' | 1 éve | 
				
					
						|  Yangzw | c8c55e199a
							
							Merge branch 'dev/2024/0422/update-admin' of Harper/feifan-backend-zx-admin into master | 1 éve | 
				
					
						|  Yangzw | 3c5f2b63b3
							
							修改商户下的用户角色名称展示 | 1 éve |