| 
						
					 | 
					
						
						
							
						
						690378aa3e
					 | 
					
						
						
							
							太空舱,套餐,太空舱订单 生成crud1
						
						
						
						
						
						
					 | 
					
						2024-10-30 17:13:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e0c73bde69
					 | 
					
						
						
							
							Merge branch 'master' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-10-30 17:09:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e5c88a4f0
					 | 
					
						
						
							
							太空舱,套餐,太空舱订单 生成crud
						
						
						
						
						
						
					 | 
					
						2024-10-30 16:53:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0a0f44c297
					 | 
					
						
						
							
							订单修改
						
						
						
						
						
						
					 | 
					
						2024-10-30 15:43:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b17e85469f
					 | 
					
						
						
							
							批量上下架
						
						
						
						
						
						
					 | 
					
						2024-10-30 13:59:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a4fa53440b
					 | 
					
						
						
							
							售卖商品
						
						
						
						
						
						
					 | 
					
						2024-10-30 10:22:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3bff7c906a
					 | 
					
						
						
							
							超市售卖商品绑定门店
						
						
						
						
						
						
					 | 
					
						2024-10-29 18:00:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b6e1913db
					 | 
					
						
						
							
							超市订单
						
						
						
						
						
						
					 | 
					
						2024-10-29 16:21:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						28afb0d881
					 | 
					
						
						
							
							超市订单、早中午订单统计
						
						
						
						
						
						
					 | 
					
						2024-10-29 14:10:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						620981d836
					 | 
					
						
						
							
							大屏与收银机
						
						
						
						
						
						
					 | 
					
						2024-10-25 09:27:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3467180f8f
					 | 
					
						
						
							
							大屏
						
						
						
						
						
						
					 | 
					
						2024-10-24 14:59:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d42c1ffea4
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-23 14:45:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						919c151247
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-23 14:42:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2dc526dbcc
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-23 14:02:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d3bc8cc6aa
					 | 
					
						
						
							
							Merge branch 'refs/heads/master' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-10-23 11:58:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						09027a1a64
					 | 
					
						
						
							
							大屏
						
						
						
						
						
						
					 | 
					
						2024-10-23 11:57:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						930a56fe3a
					 | 
					
						
						
							
							Merge branch 'refs/heads/master' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-10-23 11:36:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e003cd1d3a
					 | 
					
						
						
							
							大屏
						
						
						
						
						
						
					 | 
					
						2024-10-23 11:33:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fdb66108ab
					 | 
					
						
						
							
							Merge branch 'refs/heads/master' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-10-23 10:38:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						824527fbc3
					 | 
					
						
						
							
							二维码
						
						
						
						
						
						
					 | 
					
						2024-10-23 10:37:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a52f6bffc0
					 | 
					
						
						
							
							二维码
						
						
						
						
						
						
					 | 
					
						2024-10-23 10:11:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c3751223b
					 | 
					
						
						
							
							Merge branch 'refs/heads/master' into 支付优化测试
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java 
						
						
					 | 
					
						2024-10-23 09:54:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6b658d7af0
					 | 
					
						
						
							
							解绑优化
						
						
						
						
						
						
					 | 
					
						2024-10-23 09:41:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9a8ec4cd4d
					 | 
					
						
						
							
							二维码
						
						
						
						
						
						
					 | 
					
						2024-10-22 17:29:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						470d76f8c1
					 | 
					
						
						
							
							Merge branch 'refs/heads/master' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-10-22 16:05:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a995bbbe8b
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-22 15:55:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1506509c34
					 | 
					
						
						
							
							超市订单
						
						
						
						
						
						
					 | 
					
						2024-10-22 14:40:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f17a3e6f5
					 | 
					
						
						
							
							餐盘解绑限时,超市订单
						
						
						
						
						
						
					 | 
					
						2024-10-22 14:37:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dbe0c9a61b
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-22 14:35:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f26bf709b5
					 | 
					
						
						
							
							Merge branch 'refs/heads/master' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-10-21 17:43:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						be4886585c
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-21 17:42:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d25f38189a
					 | 
					
						
						
							
							减免
						
						
						
						
						
						
					 | 
					
						2024-10-21 17:18:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5ee81d5d39
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-21 15:20:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						862823b82f
					 | 
					
						
						
							
							支付修改
						
						
						
						
						
						
					 | 
					
						2024-10-21 11:32:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |