From f264456b1e4fd284f53ecc4c70a3b951578bfd2d Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 service/dataServer.go |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/service/dataServer.go b/service/dataServer.go
index ab15917..4ea3990 100644
--- a/service/dataServer.go
+++ b/service/dataServer.go
@@ -105,7 +105,7 @@
 	data.OrderType = orderTypeList
 
 	// get ServiceContractStatus list
-	serviceContractStatusList, _ := ServiceGroup.GetServiceContractStatusList()
+	serviceContractStatusList, _, _ := ServiceGroup.GetServiceContractStatusList()
 	data.ServiceContractStatus = serviceContractStatusList
 
 	// get ServiceContractType list
@@ -148,8 +148,7 @@
 	currencyList, _ := ServiceGroup.GetCurrencyList()
 	data.Currency = currencyList
 
-
 	errCode = ecode.OK
 
 	return
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0