From 6cd990b24911fadb9b7304e62317d83b2e6306a6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 13 十一月 2023 19:44:13 +0800
Subject: [PATCH] 调整设备id取值优先级，conf.Conf.System.DeviceId优先级比serf配置高
---
model/process_model.go | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/model/process_model.go b/model/process_model.go
index eeffa77..1614b26 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -11,7 +11,7 @@
type (
// ProcessModel 宸ヨ壓鍙傛暟
ProcessModel struct {
- gorm.Model `json:"-"`
+ gorm.Model
Number string `gorm:"index;column:number;type:varchar(255);not null;default ''" json:"number"` //宸ヨ壓妯″瀷缂栧彿
Product string `gorm:"column:product;type:varchar(255);not null;default ''" json:"product"` //浜у搧鍚嶇О
Procedure string `gorm:"column:procedure;type:varchar(255);not null;default ''" json:"procedure"` //宸ュ簭
@@ -144,7 +144,7 @@
}
if len(slf.Numbers) != 0 {
- db = db.Where("number in ?", slf.Numbers)
+ db = db.Where("number in (?)", slf.Numbers)
}
return db
--
Gitblit v1.8.0