From da17d5c7365b6123d68519ed8fa671ef29415d69 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 05 六月 2024 10:52:43 +0800
Subject: [PATCH] Merge branch 'tzskMonitor-AGV-2' of http://47.97.1.152:5880/r/private into tzskMonitor-AGV-2
---
Monitor-APP/pages/index/data.json | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 2660c1a..439403e 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -76,7 +76,11 @@
"mk": "N",
"whsType": null,
"wrkSts": 205,
+<<<<<<< HEAD
"ioType": 107,
+=======
+ "ioType": 53,
+>>>>>>> bd18bae05ec337f06ba825d4e4148f7129009c14
"crnNo": null,
"steNo": null,
"outMost": null,
--
Gitblit v1.9.1