From 468ceb8a9bfe9e15e3be470b23809dde83a11f0d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 19:14:53 +0800
Subject: [PATCH] merge master
---
model/process_model.go | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/model/process_model.go b/model/process_model.go
index 57e73a8..7c3afb4 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -11,15 +11,17 @@
type (
// ProcessModel 宸ヨ壓鍙傛暟
ProcessModel struct {
- gorm.Model
- Number string `gorm:"index;column:number;type:varchar(255);not null;default '';comment:宸ヨ壓妯″瀷缂栧彿" json:"number"` //宸ヨ壓妯″瀷缂栧彿
- Product string `gorm:"column:product;type:varchar(255);not null;default '';comment:浜у搧鍚嶇О" json:"product"` //浜у搧鍚嶇О
- Procedure string `gorm:"column:procedure;type:varchar(255);not null;default '';comment:宸ュ簭" json:"procedure"` //宸ュ簭
- Params string `gorm:"type:text;comment:宸ヨ壓鍙傛暟閿�煎json涓�"`
- ParamsMap map[string]interface{} `json:"paramsMap" gorm:"-"`
- DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
- IsNew bool `json:"isNew" gorm:"column:is_new;comment:鏄惁鏈�鏂扮殑"` //鏄惁鏈�鏂扮殑
- IsUpdate bool `json:"isUpdate" gorm:"-"` //鍓嶇鐢�
+ gorm.Model `json:"-"`
+ Number string `gorm:"index;column:number;type:varchar(255);not null;default '';comment:宸ヨ壓妯″瀷缂栧彿" json:"number"` //宸ヨ壓妯″瀷缂栧彿
+ Product string `gorm:"column:product;type:varchar(255);not null;default '';comment:浜у搧鍚嶇О" json:"product"` //浜у搧鍚嶇О
+ Procedure string `gorm:"column:procedure;type:varchar(255);not null;default '';comment:宸ュ簭" json:"procedure"` //宸ュ簭
+ Params string `gorm:"type:text;comment:宸ヨ壓鍙傛暟閿�煎json涓�"`
+ ParamsMap map[string]interface{} `json:"paramsMap" gorm:"-"`
+ DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
+ IsNew bool `json:"-" gorm:"column:is_new;comment:鏄惁鏈�鏂扮殑"` //鏄惁鏈�鏂扮殑
+ IsUpdate bool `json:"isUpdate" gorm:"-"` //鍓嶇鐢�
+ NewParamsMap map[string]interface{} `json:"newParamsMap" gorm:"-"`
+ NewNumber string `json:"newNumber" gorm:"-"`
}
ProcessModelSearch struct {
--
Gitblit v1.8.0