From 2a6d8a858ca7e41436548b35db147b5cdad4e4be Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/configuration/Action.json |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/Action.json b/CanadaMes-ui/src/configuration/Action.json
index 64ed585..0c25377 100644
--- a/CanadaMes-ui/src/configuration/Action.json
+++ b/CanadaMes-ui/src/configuration/Action.json
@@ -155,42 +155,42 @@
       "page": "1"
     },
     {
-      "name": "B01 YV TURN",
+      "name": "B01 Solenoid TURN",
       "value": 1,
       "state": "1",
       "type": "1",
       "page": "1"
     },
     {
-      "name": "B01 YV UP DOWN",
+      "name": "B01 Solenoid UP DOWN",
       "value": 1,
       "state": "1",
       "type": "1",
       "page": "1"
     },
     {
-      "name": "B02 YV TURN",
+      "name": "B02 Solenoid TURN",
       "value": 1,
       "state": "1",
       "type": "1",
       "page": "1"
     },
     {
-      "name": "B02 YV UP DOWN",
+      "name": "B02 Solenoid UP DOWN",
       "value": 1,
       "state": "1",
       "type": "1",
       "page": "1"
     },
     {
-      "name": "B01 YV Gassing",
+      "name": "B01 Solenoid Gassing",
       "value": 1,
       "state": "1",
       "type": "1",
       "page": "1"
     },
     {
-      "name": "B02 YV Gassing",
+      "name": "B02 Solenoid Gassing",
       "value": 1,
       "state": "1",
       "type": "1",
@@ -587,6 +587,13 @@
       "state": "1",
       "type": "1",
       "page": "1"
+    },
+    {
+      "name": "abort/resumeTasks",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     }
   ],
   "address": [

--
Gitblit v1.8.0