From b33cc6eee0d88f566a6370e12633da50883b4d34 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 13 Oct 2023 13:36:39 +0800
Subject: [PATCH] =?UTF-8?q?proto=E6=96=87=E4=BB=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/ibpGraphics.proto           | 1 +
 protos/pslGraphics.proto           | 6 +-----
 protos/stationLayoutGraphics.proto | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/protos/ibpGraphics.proto b/protos/ibpGraphics.proto
index 9f5587a..94bc76b 100644
--- a/protos/ibpGraphics.proto
+++ b/protos/ibpGraphics.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 import "stationLayoutGraphics.proto";
 import "relayCabinetLayoutGraphics.proto";
 package ibpGraphicData;
+option go_package = "./ats/verify/protos/graphicData";
 
 message IBPGraphicStorage {
   graphicData.Canvas canvas = 1;
diff --git a/protos/pslGraphics.proto b/protos/pslGraphics.proto
index 1a50126..d175272 100644
--- a/protos/pslGraphics.proto
+++ b/protos/pslGraphics.proto
@@ -55,10 +55,6 @@ message PslText {
 /* 门控箱关联的设备列表 */
 message GatedRelateDevice {
   string code = 1;//设备编号
-  repeated GatedCombinationtype combinationtypes = 2; //组合类型
+  repeated graphicData.DeviceCombinationtype combinationtypes = 2; //组合类型
   graphicData.RelatedRef.DeviceType deviceType = 3;//设备类型
 }
-message GatedCombinationtype {
-  string code = 1;
-  repeated string refDevices = 2;//门控箱关联的设备
-}
diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto
index cb2008e..7d3de2b 100644
--- a/protos/stationLayoutGraphics.proto
+++ b/protos/stationLayoutGraphics.proto
@@ -471,10 +471,10 @@ message KilometerConvert {
 /* 车站关联的设备列表 */
 message StationRelateDevice {
   string code = 1;//设备编号
-  repeated Combinationtype combinationtypes = 2; //组合类型
+  repeated DeviceCombinationtype combinationtypes = 2; //组合类型
   RelatedRef.DeviceType deviceType = 3;//设备类型
 }
-message Combinationtype {
+message DeviceCombinationtype {
   string code = 1;
-  repeated string refDevices = 2;//门控箱关联的设备
+  repeated string refDevices = 2;//车站关联的设备
 }