From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 model/serviceOrder.go |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index e249844..21cd7f1 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -21,7 +21,6 @@
 		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"`
-		OrderManage          OrderManage        `gorm:"foreignKey:OrderId"`
 		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"`

--
Gitblit v1.8.0