| 
						
					 | 
					
						
						
							
						
						08863c51ab
					 | 
					
						
						
							
							Merge branch 'refs/heads/master' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-10-21 10:08:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						669887e3b1
					 | 
					
						
						
							
							统计
						
						
						
						
						
						
					 | 
					
						2024-10-21 10:08:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f624a147d0
					 | 
					
						
						
							
							优化支付
						
						
						
						
						
						
					 | 
					
						2024-10-21 09:33:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4a789a967f
					 | 
					
						
						
							
							导出
						
						
						
						
						
						
					 | 
					
						2024-10-21 09:25:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						880689326b
					 | 
					
						
						
							
							根据时间导出多个sheet 页
						
						
						
						
						
						
					 | 
					
						2024-10-18 17:11:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ca1d5e6537
					 | 
					
						
						
							
							统计和导出
						
						
						
						
						
						
					 | 
					
						2024-10-18 17:04:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b5c445a9b6
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2024-10-18 16:24:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4c6aab0221
					 | 
					
						
						
							
							根据时间导出多个sheet 页1
						
						
						
						
						
						
					 | 
					
						2024-10-18 16:23:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						56a4bb7e8b
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-18 16:19:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f98f2ea615
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-18 16:18:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5d58bf03f2
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-18 14:55:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2937a271ac
					 | 
					
						
						
							
							二维码支付
						
						
						
						
						
						
					 | 
					
						2024-10-18 14:29:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2cd8d3a7e5
					 | 
					
						
						
							
							二维码
						
						
						
						
						
						
					 | 
					
						2024-10-18 14:00:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8d4f8a6706
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-17 16:01:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b8f709f284
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2024-10-16 15:52:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a8f4660f16
					 | 
					
						
						
							
							每日统计
						
						
						
						
						
						
					 | 
					
						2024-10-16 15:51:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d6ab021200
					 | 
					
						
						
							
							根据时间导出多个sheet 页
						
						
						
						
						
						
					 | 
					
						2024-10-16 15:20:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						185520f436
					 | 
					
						
						
							
							每日统计
						
						
						
						
						
						
					 | 
					
						2024-10-16 09:58:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fc2819a4c7
					 | 
					
						
						
							
							导出
						
						
						
						
						
						
					 | 
					
						2024-10-15 11:15:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e840b1bc70
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-14 16:26:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						374ba73336
					 | 
					
						
						
							
							删除会员接口
						
						
						
						
						
						
					 | 
					
						2024-10-11 18:23:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						881304a059
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-11 16:22:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						76f540c108
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-11 15:50:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7173d26dbf
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-10 20:39:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						866ea0ae85
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-10 20:15:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						33440089e0
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-10 19:04:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e7632a7807
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-10 16:09:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ba92347a5
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-10 15:58:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						704010bad6
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-10 15:16:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						71143c2c77
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-09 20:09:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2a03745784
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-09 18:34:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2ae099b572
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-09 18:22:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7abaa2d05e
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-09 15:51:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a1ac698daf
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-09 15:02:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5f8f85b3df
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-08 19:06:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a146ffc12
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-08 18:42:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3e5b1d7427
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-08 18:31:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b3f64ed799
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-08 16:50:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						457a974fc0
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-08 16:39:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						825c6658ef
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-08 10:59:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a695317bc8
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-08 09:38:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a25250c5de
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-07 21:14:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						804cbcc655
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2024-10-07 16:55:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e3aa6e4194
					 | 
					
						
						
							
							bug修改
						
						
						
						
						
						
					 | 
					
						2024-10-07 10:10:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a12121fefb
					 | 
					
						
						
							
							卡号BUG
						
						
						
						
						
						
					 | 
					
						2024-10-06 20:02:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6c179e5252
					 | 
					
						
						
							
							姓名
						
						
						
						
						
						
					 | 
					
						2024-10-06 19:10:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f82d52313e
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2024-10-06 18:56:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a63ebf2919
					 | 
					
						
						
							
							更改扣款顺序,添加菜品接口
						
						
						
						
						
						
					 | 
					
						2024-10-06 15:05:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0720cf442c
					 | 
					
						
						
							
							优化门店ID获取方式
						
						
						
						
						
						
					 | 
					
						2024-10-06 11:29:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4b535de1c2
					 | 
					
						
						
							
							添加字段
						
						
						
						
						
						
					 | 
					
						2024-10-05 17:57:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |