From b4201a0054369a8cd89e940947fd6f1a89f357c2 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 02 八月 2023 13:38:24 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 model/response/response.go |   54 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/model/response/response.go b/model/response/response.go
index 04ea37d..46774ab 100644
--- a/model/response/response.go
+++ b/model/response/response.go
@@ -47,11 +47,13 @@
 	}
 
 	ContactResponse struct {
-		List []*model.ContactDetail `json:"list"`
+		List  []*model.ContactDetail `json:"list"`
+		Count int                    `json:"count"`
 	}
 
 	ClientResponse struct {
-		List []*model.Client `json:"list"`
+		List  []*model.Client `json:"list"`
+		Count int             `json:"count"`
 	}
 
 	ClientStatusResponse struct {
@@ -87,7 +89,8 @@
 	}
 
 	SalesLeadsResponse struct {
-		List []*model.SalesLeads `json:"list"`
+		List  []*model.SalesLeads `json:"list"`
+		Count int                 `json:"count"`
 	}
 
 	SalesSourceResponse struct {
@@ -95,11 +98,13 @@
 	}
 
 	FollowRecordResponse struct {
-		List []*model.FollowRecord `json:"list"`
+		List  []*model.FollowRecord `json:"list"`
+		Count int                   `json:"count"`
 	}
 
 	SaleChanceResponse struct {
-		List []*model.SaleChance `json:"list"`
+		List  []*model.SaleChance `json:"list"`
+		Count int                 `json:"count"`
 	}
 
 	SaleStageResponse struct {
@@ -123,47 +128,58 @@
 	}
 
 	QuotationResponse struct {
-		List []*model.Quotation `json:"list"`
+		List  []*model.Quotation `json:"list"`
+		Count int                `json:"count"`
 	}
 
 	MasterOrderResponse struct {
-		List []*model.MasterOrder `json:"list"`
+		List  []*model.MasterOrder `json:"list"`
+		Count int                  `json:"count"`
 	}
 
 	SubOrderResponse struct {
-		List []*model.SubOrder `json:"list"`
+		List  []*model.SubOrder `json:"list"`
+		Count int               `json:"count"`
 	}
 
 	SalesDetailsResponse struct {
-		List []*model.SalesDetails `json:"list"`
+		List  []*model.SalesDetails `json:"list"`
+		Count int                   `json:"count"`
 	}
 
 	SalesReturnResponse struct {
-		List []*model.SalesReturn `json:"list"`
+		List  []*model.SalesReturn `json:"list"`
+		Count int                  `json:"count"`
 	}
 
 	SalesRefundResponse struct {
-		List []*model.SalesRefund `json:"list"`
+		List  []*model.SalesRefund `json:"list"`
+		Count int                  `json:"count"`
 	}
 
 	ContractResponse struct {
-		List []*model.Contract `json:"list"`
+		List  []*model.Contract `json:"list"`
+		Count int               `json:"count"`
 	}
 
 	PlanResponse struct {
-		List []*model.Plan `json:"list"`
+		List  []*model.Plan `json:"list"`
+		Count int           `json:"count"`
 	}
 
 	ServiceContractsResponse struct {
-		List []*model.ServiceContract `json:"list"`
+		List  []*model.ServiceContract `json:"list"`
+		Count int                      `json:"count"`
 	}
 
 	OrderManageResponse struct {
-		List []*model.OrderManage `json:"list"`
+		List  []*model.OrderManage `json:"list"`
+		Count int                  `json:"count"`
 	}
 
 	ServiceFollowupResponse struct {
-		List []*model.ServiceFollowup `json:"list"`
+		List  []*model.ServiceFollowup `json:"list"`
+		Count int                      `json:"count"`
 	}
 
 	CustomerServiceSheetResponse struct {
@@ -171,7 +187,8 @@
 	}
 
 	ServiceFeeManageResponse struct {
-		List []*model.ServiceFeeManage `json:"list"`
+		List  []*model.ServiceFeeManage `json:"list"`
+		Count int                       `json:"count"`
 	}
 
 	MenuTreeResponse struct {
@@ -182,7 +199,6 @@
 
 		// 甯佺
 		Currency []*model.Currency `json:"currency"`
-
 
 		// 鎶ヤ环鍗曠姸鎬�
 		QuotationStatus []*model.QuotationStatus `json:"quotationStatus"`
@@ -328,4 +344,4 @@
 	CurrencyResponse struct {
 		List []*model.Currency `json:"list"`
 	}
-)
\ No newline at end of file
+)

--
Gitblit v1.8.0