From 357fa7bd92da576786fac0f5754cd75900d79bf7 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 21 七月 2023 14:15:44 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 api/v1/serviceContracts.go |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/v1/serviceContracts.go b/api/v1/serviceContracts.go
index 092c1e2..b04b77d 100644
--- a/api/v1/serviceContracts.go
+++ b/api/v1/serviceContracts.go
@@ -164,8 +164,8 @@
 	result.ContactId = serviceContract.ContactId
 	result.SaleChanceId = serviceContract.SaleChanceId
 	result.QuotationId = serviceContract.QuotationId
-	result.TypeId = serviceContract.TypeId
-	result.StatusId = serviceContract.StatusId
+	result.ServiceContractTypeId = serviceContract.TypeId
+	result.ServiceContractStatusId = serviceContract.StatusId
 	result.ServiceTimes = serviceContract.ServiceTimes
 	result.Terms = serviceContract.Terms
 	result.Products = serviceContract.Products

--
Gitblit v1.8.0