From 910f6bdd9eb2fc19244b3ed64d117cf1ee1d42ca Mon Sep 17 00:00:00 2001
From: tiger_zhou <Shmily123@WJ>
Date: Tue, 6 Feb 2024 10:49:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=91=81=E9=92=AE=E6=97=81=E8=B7=AF?=
 =?UTF-8?q?=E5=8F=8A=E6=97=81=E8=B7=AF=E5=A4=8D=E4=BD=8D=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/device_state.proto | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/protos/device_state.proto b/protos/device_state.proto
index 9e1aa81..b5796b9 100644
--- a/protos/device_state.proto
+++ b/protos/device_state.proto
@@ -480,7 +480,7 @@ message ButtonState {
   uint32 id = 1;
   bool down = 2;
   bool active = 3; // 带灯的按钮
-  bool bypass = 4; //摁钮，钥匙 是否旁路
+//  bool bypass = 4; //摁钮，钥匙 是否旁路
 }
 
 // 警铃状态
@@ -517,7 +517,7 @@ message AsdState {
 message KeyState {
   uint32 id = 1;
   int32 gear = 2;
-  bool bypass = 3; //摁钮，钥匙 是否旁路
+//  bool bypass = 3; //摁钮，钥匙 是否旁路
 }
 
 // 战场图门控箱继电器状态

From f23ca441ef14eefb98f1b6f9f504f6d315a4e2b6 Mon Sep 17 00:00:00 2001
From: tiger_zhou <Shmily123@WJ>
Date: Tue, 6 Feb 2024 12:07:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=91=81=E9=92=AE=E6=97=81=E8=B7=AF?=
 =?UTF-8?q?=E5=8F=8A=E6=97=81=E8=B7=AF=E5=A4=8D=E4=BD=8D=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/request.proto | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/protos/request.proto b/protos/request.proto
index 0f85a14..7b65a94 100644
--- a/protos/request.proto
+++ b/protos/request.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package request;
 option go_package = "joylink.club/bj-rtsts-server/dto/request_proto";
+/*
 message BypassOperationReq{
   enum Operation{
     bypass = 0;  //旁路
@@ -22,6 +23,7 @@ message BypassOperationReq{
   BypassOperationReq.Operation operation = 8;
     BypassOperationReq.BtnType btnType = 9;
 }
+*/
 
 // 继电器
 message Relay {

From 86dcfd8208b2ebe0c53b7a351b746d7dae2f5aa4 Mon Sep 17 00:00:00 2001
From: ZhaoErWei <1107209405@qq.com>
Date: Tue, 6 Feb 2024 12:21:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=B4=A7=E6=80=A5=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BECode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/stationLayoutGraphics.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto
index ae0f605..40b7be0 100644
--- a/protos/stationLayoutGraphics.proto
+++ b/protos/stationLayoutGraphics.proto
@@ -527,7 +527,7 @@ message EsbButton {
   // int32 refStand = 5; // 关联站台索引
   string oldrefStand = 6; // 关联站台
   uint32 refStand = 7; // 关联站台
-  string refEsbButtonMapCode = 8; // 关联紧急关闭按钮地图Code--关联PSL地图
+  //string refEsbButtonMapCode = 8; // 关联紧急关闭按钮地图Code--关联PSL地图
 }
 
 message GatedBox {