zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								dba6ed21e9
								
							
						 | 
						
							
							
								
								验货数量更改2
							
							
							
							
							
						 | 
						
							2025-10-21 17:45:44 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								7c96dde561
								
							
						 | 
						
							
							
								
								验货数量更改
							
							
							
							
							
						 | 
						
							2025-10-21 17:32:12 +08:00 | 
						
					
				
					
						
							
							
								
								 jjLv
							
						 | 
						
							
							
							
							
							
								
							
							
								c8fa83bd0f
								
							
						 | 
						
							
							
								
								供应链增加人员配置、供应商人员
							
							
							
							
							
						 | 
						
							2025-10-17 08:58:23 +08:00 | 
						
					
				
					
						
							
							
								
								 jjLv
							
						 | 
						
							
							
							
							
							
								
							
							
								171c87d447
								
							
						 | 
						
							
							
								
								供应商、订单采购加入供应商筛选等
							
							
							
							
							
						 | 
						
							2025-10-14 18:08:20 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								9c71f3fe98
								
							
						 | 
						
							
							
								
								bug修改3
							
							
							
							
							
						 | 
						
							2025-09-29 14:47:04 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0967d6d5df
								
							
						 | 
						
							
							
								
								bug修改2
							
							
							
							
							
						 | 
						
							2025-09-29 14:41:36 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								e3716f792b
								
							
						 | 
						
							
							
								
								线上订单注释核销退单等功能(无法推送优尔)
							
							
							
							
							
						 | 
						
							2025-09-29 14:36:21 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4bee0c3580
								
							
						 | 
						
							
							
								
								Bug修改
							
							
							
							
							
						 | 
						
							2025-09-29 13:20:15 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								597ae9277c
								
							
						 | 
						
							
							
								
								页面修改
							
							
							
							
							
						 | 
						
							2025-09-28 09:16:19 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								9b2a0f5d61
								
							
						 | 
						
							
							
								
								健康一体级/设备类型修改
							
							
							
							
							
						 | 
						
							2025-09-25 14:20:18 +08:00 | 
						
					
				
					
						
							
							
								
								 lizhenhua
							
						 | 
						
							
							
							
							
							
								
							
							
								ce5a1c5d0f
								
							
						 | 
						
							
							
								
								基本配置修改 优化
							
							
							
							
							
						 | 
						
							2025-09-24 15:53:56 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								e77de03a00
								
							
						 | 
						
							
							
								
								厨房修改
							
							
							
							
							
						 | 
						
							2025-09-24 09:19:49 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								cae632dfec
								
							
						 | 
						
							
							
								
								Merge branch 'bonus-jyy-smart-canteen' of http://14.103.246.124:16000/bonus/bonus-ui into bonus-jyy-smart-canteen
							
							
							
							
							
						 | 
						
							2025-09-22 17:29:35 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								e2914793d1
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2025-09-22 17:29:21 +08:00 | 
						
					
				
					
						
							
							
								
								 jiask
							
						 | 
						
							
							
							
							
							
								
							
							
								51315da75d
								
							
						 | 
						
							
							
								
								jsk
							
							
							
							
							
						 | 
						
							2025-09-22 12:17:46 +08:00 | 
						
					
				
					
						
							
							
								
								 lizhenhua
							
						 | 
						
							
							
							
							
							
								
							
							
								7d8e93e965
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/bonus-jyy-smart-canteen' into bonus-jyy-smart-canteen
							
							
							
							
							
						 | 
						
							2025-09-15 16:09:49 +08:00 | 
						
					
				
					
						
							
							
								
								 lizhenhua
							
						 | 
						
							
							
							
							
							
								
							
							
								35d7787215
								
							
						 | 
						
							
							
								
								下拉框添加
							
							
							
							
							
						 | 
						
							2025-09-15 16:08:41 +08:00 | 
						
					
				
					
						
							
							
								
								 lizhenhua
							
						 | 
						
							
							
							
							
							
								
							
							
								df3d8f527d
								
							
						 | 
						
							
							
								
								添加下拉框
							
							
							
							
							
						 | 
						
							2025-09-15 13:59:02 +08:00 | 
						
					
				
					
						
							
							
								
								 lizhenhua
							
						 | 
						
							
							
							
							
							
								
							
							
								2fc5955d3d
								
							
						 | 
						
							
							
								
								手机号码 处理
							
							
							
							
							
						 | 
						
							2025-09-15 13:29:33 +08:00 | 
						
					
				
					
						
							
							
								
								 lizhenhua
							
						 | 
						
							
							
							
							
							
								
							
							
								f6511be656
								
							
						 | 
						
							
							
								
								加入下拉框负责人
							
							
							
							
							
						 | 
						
							2025-09-15 13:12:43 +08:00 | 
						
					
				
					
						
							
							
								
								 jiask
							
						 | 
						
							
							
							
							
							
								
							
							
								cfdb17bec7
								
							
						 | 
						
							
							
								
								jsk
							
							
							
							
							
						 | 
						
							2025-09-15 09:56:09 +08:00 | 
						
					
				
					
						
							
							
								
								 jiask
							
						 | 
						
							
							
							
							
							
								
							
							
								eb2a2eb7c9
								
							
						 | 
						
							
							
								
								jsk
							
							
							
							
							
						 | 
						
							2025-09-15 09:17:21 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								7107de85d0
								
							
						 | 
						
							
							
								
								测试问题修改5
							
							
							
							
							
						 | 
						
							2025-09-12 18:40:25 +08:00 | 
						
					
				
					
						
							
							
								
								 lizhenhua
							
						 | 
						
							
							
							
							
							
								
							
							
								4935f52233
								
							
						 | 
						
							
							
								
								谁DVD发DVD发到付v
							
							
							
							
							
						 | 
						
							2025-09-12 18:37:10 +08:00 | 
						
					
				
					
						
							
							
								
								 lizhenhua
							
						 | 
						
							
							
							
							
							
								
							
							
								a730a7761a
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/bonus-jyy-smart-canteen' into bonus-jyy-smart-canteen
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/canteen/order/reserveManagement/index.vue 
							
						 | 
						
							2025-09-12 18:25:31 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								c9ad37f556
								
							
						 | 
						
							
							
								
								测试问题修改3
							
							
							
							
							
						 | 
						
							2025-09-12 18:16:08 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								33d963dc6d
								
							
						 | 
						
							
							
								
								Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen
							
							
							
							
							
						 | 
						
							2025-09-12 18:15:24 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								ae8c8f584e
								
							
						 | 
						
							
							
								
								测试问题修改
							
							
							
							
							
						 | 
						
							2025-09-12 17:56:54 +08:00 | 
						
					
				
					
						
							
							
								
								 jiask
							
						 | 
						
							
							
							
							
							
								
							
							
								72e36d90c2
								
							
						 | 
						
							
							
								
								jsk
							
							
							
							
							
						 | 
						
							2025-09-12 14:27:50 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								525d80c384
								
							
						 | 
						
							
							
								
								测试问题修改2
							
							
							
							
							
						 | 
						
							2025-09-11 16:41:41 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								6e472bdd59
								
							
						 | 
						
							
							
								
								Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen
							
							
							
							
							
						 | 
						
							2025-09-11 16:40:43 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								b8328b8047
								
							
						 | 
						
							
							
								
								测试问题修改
							
							
							
							
							
						 | 
						
							2025-09-11 16:40:38 +08:00 | 
						
					
				
					
						
							
							
								
								 jjLv
							
						 | 
						
							
							
							
							
							
								
							
							
								85d1909fd7
								
							
						 | 
						
							
							
								
								小票打印机
							
							
							
							
							
						 | 
						
							2025-09-11 15:54:17 +08:00 | 
						
					
				
					
						
							
							
								
								 jiask
							
						 | 
						
							
							
							
							
							
								
							
							
								cdfa2ec3da
								
							
						 | 
						
							
							
								
								JSK
							
							
							
							
							
						 | 
						
							2025-09-11 15:13:02 +08:00 | 
						
					
				
					
						
							
							
								
								 jjLv
							
						 | 
						
							
							
							
							
							
								
							
							
								36aef6744f
								
							
						 | 
						
							
							
								
								小票打印机
							
							
							
							
							
						 | 
						
							2025-09-11 14:48:13 +08:00 | 
						
					
				
					
						
							
							
								
								 lizhenhua
							
						 | 
						
							
							
							
							
							
								
							
							
								cfc37c65ff
								
							
						 | 
						
							
							
								
								基本配置修改 优化
							
							
							
							
							
						 | 
						
							2025-09-11 14:43:16 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								854c120920
								
							
						 | 
						
							
							
								
								测试问题修改
							
							
							
							
							
						 | 
						
							2025-09-10 18:09:05 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								eb6c328d45
								
							
						 | 
						
							
							
								
								测试问题修改
							
							
							
							
							
						 | 
						
							2025-09-10 10:21:15 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								14b11e5538
								
							
						 | 
						
							
							
								
								测试问题修改4
							
							
							
							
							
						 | 
						
							2025-09-08 18:22:47 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								5fa12dd165
								
							
						 | 
						
							
							
								
								测试问题修改3
							
							
							
							
							
						 | 
						
							2025-09-08 16:46:34 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								b4b0fbbe21
								
							
						 | 
						
							
							
								
								测试问题修改
							
							
							
							
							
						 | 
						
							2025-09-05 09:26:11 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								beeb4efbc3
								
							
						 | 
						
							
							
								
								测试问题修改
							
							
							
							
							
						 | 
						
							2025-09-04 13:38:14 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								29d08c7f56
								
							
						 | 
						
							
							
								
								测试问题修改前端优化
							
							
							
							
							
						 | 
						
							2025-09-04 13:10:37 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								c9fb763bc1
								
							
						 | 
						
							
							
								
								测试问题修改9/3
							
							
							
							
							
						 | 
						
							2025-09-03 18:08:55 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a1a432b636
								
							
						 | 
						
							
							
								
								测试问题修改
							
							
							
							
							
						 | 
						
							2025-09-02 18:38:29 +08:00 | 
						
					
				
					
						
							
							
								
								 jjLv
							
						 | 
						
							
							
							
							
							
								
							
							
								4b1b7bf556
								
							
						 | 
						
							
							
								
								post改成get请求
							
							
							
							
							
						 | 
						
							2025-09-01 09:40:12 +08:00 | 
						
					
				
					
						
							
							
								
								 jjLv
							
						 | 
						
							
							
							
							
							
								
							
							
								f24a312af6
								
							
						 | 
						
							
							
								
								post改成get请求
							
							
							
							
							
						 | 
						
							2025-09-01 09:33:55 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								7794157c7a
								
							
						 | 
						
							
							
								
								测评问题修改
							
							
							
							
							
						 | 
						
							2025-08-28 17:59:52 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								6b9411bc5e
								
							
						 | 
						
							
							
								
								问题修改
							
							
							
							
							
						 | 
						
							2025-08-25 16:04:21 +08:00 | 
						
					
				
					
						
							
							
								
								 zzyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								344e14a041
								
							
						 | 
						
							
							
								
								添加原料临期设置
							
							
							
							
							
						 | 
						
							2025-08-22 14:10:58 +08:00 |