From 9a240b711d25f57703b9cf104eb602969437541e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 20 十月 2023 21:52:42 +0800
Subject: [PATCH] 合并设备和plc配置

---
 model/common/common.go |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/model/common/common.go b/model/common/common.go
index 2f8c2f4..f92ae17 100644
--- a/model/common/common.go
+++ b/model/common/common.go
@@ -124,10 +124,13 @@
 	IsFinish     bool   //鏄惁瀹屾垚
 }
 
-type Device struct {
+// DeviceMsg 涓嬪彂鍒扮粓绔殑璁惧淇℃伅
+type DeviceMsg struct {
 	ID                  string                 `gorm:"comment:涓婚敭ID;primaryKey;type:varchar(191);" json:"id"`
 	DeviceProcedureAttr []*DeviceProcedureAttr `json:"deviceProcedureAttr"` // 璁惧宸ュ簭灞炴�у垪琛�
 	ExtChannelAmount    int                    `gorm:"type:tinyint;comment:棰濆鐨勯�氶亾鏁伴噺;default:0;" json:"extChannelAmount"`
+	PlcAddressList      []*PlcAddress
+	PlcConfig           *PlcConfig
 }
 type DeviceProcedureAttr struct {
 	ProcedureID   string `gorm:"index;type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`

--
Gitblit v1.8.0