From eba4eb850f0ecfb5839395aa125955ceaa2a454f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 16:39:07 +0800
Subject: [PATCH] Merge branch 'feat-serf'

---
 model/device.go |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/model/device.go b/model/device.go
index 0a1f686..46e2665 100644
--- a/model/device.go
+++ b/model/device.go
@@ -3,18 +3,18 @@
 import (
 	"apsClient/pkg/sqlitex"
 	"fmt"
-	"gorm.io/gorm"
+	"github.com/jinzhu/gorm"
 	"strings"
 )
 
 type (
 	// Device 璁惧
 	Device struct {
-		gorm.Model       `json:"-"`
-		DeviceID         string   `gorm:"unique;column:device_id;type:varchar(255);not null;default '';comment:璁惧缂栧彿" json:"deviceID"` //璁惧缂栧彿
-		ExtChannelAmount int      `gorm:"type:tinyint;comment:棰濆鐨勯�氶亾鏁伴噺;default:0;" json:"extChannelAmount"`
-		Procedures       string   `gorm:"column:procedure;type:varchar(255);not null;default '';comment:宸ュ簭" json:"procedures"` //璁惧鏀寔鐨勫伐搴忥紝鐢ㄩ�楀彿鍒嗛殧
-		ProceduresArr    []string `gorm:"-" json:"procedureAdd"`                                                               //璁惧鏀寔鐨勫伐搴忓垏鐗�
+		gorm.Model
+		DeviceID         string   `gorm:"unique;column:device_id;type:varchar(255);not null;default ''" json:"deviceID"` //璁惧缂栧彿
+		ExtChannelAmount int      `gorm:"type:tinyint;default:0" json:"extChannelAmount"`
+		Procedures       string   `gorm:"column:procedure;type:varchar(255);not null;default ''" json:"procedures"` //璁惧鏀寔鐨勫伐搴忥紝鐢ㄩ�楀彿鍒嗛殧
+		ProceduresArr    []string `gorm:"-" json:"procedureAdd"`                                                    //璁惧鏀寔鐨勫伐搴忓垏鐗�
 	}
 
 	DeviceSearch struct {

--
Gitblit v1.8.0