|  Yangzw | b7ac43bc8a
							
							Merge branch 'dev/2024/0715/update-admin-Y' of feifan/mall-backend-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 1061884730
							
							更新使用注解定时器运行计算程序 | hai 1 ano | 
				
					
						|  Yangzw | 4d3c1510c8
							
							测试使用注解定时器运行计算程序 | hai 1 ano | 
				
					
						|  Yangzw | c6c6e6d288
							
							Merge branch 'dev/2024/0715/update-admin-Y' of feifan/mall-backend-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 6cda9c4293
							
							查询支付订单信息的时候返回,并加上支付订单号 | hai 1 ano | 
				
					
						|  Yangzw | d07348fa14
							
							Merge branch 'dev/2024/0715/update-admin-Y' of feifan/mall-backend-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 440ebea09f
							
							获取用户信息返回username | hai 1 ano | 
				
					
						|  Yangzw | 94667e0b48
							
							Merge branch 'dev/2024/0715/update-admin-Y' of feifan/mall-backend-admin into master | hai 1 ano | 
				
					
						|  Yangzw | fa18b1d9e7
							
							获取用户信息返回username | hai 1 ano | 
				
					
						|  Yangzw | 86a5da375f
							
							Merge branch 'dev/2024/0715/update-admin-Y' of feifan/mall-backend-admin into master | hai 1 ano | 
				
					
						|  Yangzw | c5fe3aae55
							
							获取用户信息返回username | hai 1 ano | 
				
					
						|  Yangzw | 4cfffd7e83
							
							Merge branch 'dev/2024/0715/update-admin-Y' of feifan/mall-backend-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 77e580e345
							
							在支付订单同步的定时器中加入查询富友订单的程序 | hai 1 ano | 
				
					
						|  Yangzw | 0340808b74
							
							Merge branch 'dev/2024/0715/update-admin-Y' of feifan/mall-backend-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 972ae45a61
							
							Merge branch 'dev/2024/0715/update-admin-Y' of Harper/feifan-backend-zx-admin into master | hai 1 ano | 
				
					
						|  Yangzw | f9190aee91
							
							在支付订单同步的定时器中加入查询富友订单的程序 | hai 1 ano | 
				
					
						|  Yangzw | 7e85a0b21d
							
							Merge branch 'dev/2024/0704/update-admin-Y' of Harper/feifan-backend-zx-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 3355478b12
							
							先修改测试环境的计算程序的定时任务 | hai 1 ano | 
				
					
						|  Yangzw | 8c3cf9b90f
							
							Merge branch 'dev/2024/0704/update-admin-Y' of feifan/mall-backend-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 33fcde894d
							
							Merge branch 'dev/2024/0704/update-admin-Y' of Harper/feifan-backend-zx-admin into master | hai 1 ano | 
				
					
						|  Yangzw | dd995f0372
							
							修改结算单的计算时间 | hai 1 ano | 
				
					
						|  Yangzw | 576edbf71d
							
							Merge branch 'dev/2024/0704/update-admin-Y' of feifan/mall-backend-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 9c30607f1e
							
							Merge branch 'dev/2024/0704/update-admin-Y' of Harper/feifan-backend-zx-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 91d99dae36
							
							每日结算的对应orderId不对 | hai 1 ano | 
				
					
						|  Yangzw | 9da4a217e9
							
							Merge branch 'dev/2024/0704/update-admin-Y' of feifan/mall-backend-admin into master | hai 1 ano | 
				
					
						|  Yangzw | bceb4c912c
							
							Merge branch 'dev/2024/0704/update-admin-Y' of Harper/feifan-backend-zx-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 6546bc4d20
							
							合赢奖的来源用户加错位置了 | hai 1 ano | 
				
					
						|  Yangzw | 512002913e
							
							Merge branch 'dev/2024/0704/update-admin-Y' of feifan/mall-backend-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 9e7f6394d0
							
							Merge branch 'dev/2024/0704/update-admin-Y' of Harper/feifan-backend-zx-admin into master | hai 1 ano | 
				
					
						|  Yangzw | 9d1f8cc9ca
							
							更新每日账单功能 | hai 1 ano |