From 8f2e045fcb56929dd1d47d5799d45f688e047c6a Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期三, 16 八月 2023 19:12:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- model/serviceOrder.go | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/model/serviceOrder.go b/model/serviceOrder.go index eaa6a75..e399e81 100644 --- a/model/serviceOrder.go +++ b/model/serviceOrder.go @@ -21,10 +21,10 @@ ServiceContract ServiceContract `gorm:"foreignKey:ServiceContractId"` SalesDetailsId int `gorm:"column:order_id;type:int;not null;default:0;comment:閿�鍞鍗昳d" json:"salesDetailsId"` // 閿�鍞槑缁唅d SalesDetails SalesDetails `gorm:"foreignKey:SalesDetailsId"` - Subject string `gorm:"column:subject;type:varchar(255);not null;default:'';comment:涓婚" json:"subject"` // 涓婚 - ProductId int `gorm:"column:product_id;type:int;not null;default:0;comment:浜у搧id" json:"productId"` // 浜у搧id - Product Product `gorm:"foreignKey:ProductId"` - ServiceTypeId int `gorm:"column:service_type_id;type:int;not null;default:0;comment:鏈嶅姟鏂瑰紡id" json:"serviceTypeId"` // 鏈嶅姟鏂瑰紡id + Subject string `gorm:"column:subject;type:varchar(255);not null;default:'';comment:涓婚" json:"subject"` // 涓婚 + ProductTypeName string `gorm:"column:product_type_name;type:varchar(255);not null;default:'';comment:浜у搧鍒嗙被鍚嶇О" json:"productTypeName"` // 浜у搧鍒嗙被鍚嶇О + ProductName string `gorm:"column:product_name;type:varchar(255);not null;default:'';comment:浜у搧鍚嶇О" json:"productName"` // 浜у搧鍚嶇О + ServiceTypeId int `gorm:"column:service_type_id;type:int;not null;default:0;comment:鏈嶅姟鏂瑰紡id" json:"serviceTypeId"` // 鏈嶅姟鏂瑰紡id ServiceType ServiceType `gorm:"foreignKey:ServiceTypeId"` ServiceManId int `gorm:"column:service_man_id;type:int;not null;default:0;comment:鏈嶅姟浜哄憳" json:"serviceManId"` // 鏈嶅姟浜哄憳 ContactId int `gorm:"linkman_id" json:"contactId"` // 鑱旂郴浜篿d -- Gitblit v1.8.0