Merge branch 'dev/2.4_rai_new' into debug

models/crm/contract.go

@@ -144,7 +144,7 @@ type ContractDetail struct {
 	RescindTimeStr             string `description:"解约时间（字符串形式）"`
 	ModifyTimeStr              string `description:"最近一次更新时间（字符串形式）"`
 	CreateTimeStr              string `description:"合同添加时间（字符串形式）"`
-	Service                    []*ContractServiceAndDetail
+	Service                    []*ContractServiceAndDetailRespItem
 	RelationContractDetailList []*ContractDetail     `description:"关联合同详情"`
 	PermissionLookList         []*PermissionLookList `description:"合同里面的权限列表"`
 }

services/crm/contract.go

@@ -9,7 +9,6 @@ import (
 	"hongze/fms_api/models/system"
 	"hongze/fms_api/utils"
 	"reflect"
-	"strconv"
 	"strings"
 )
 
@@ -147,7 +146,7 @@ func getContractServiceAndDetailList(contractId int) (serviceList []*crm.Contrac
 }
 
 // GetServicePermissionMap 获取合同服务中的权限id  map
-func GetServicePermissionMap(serviceList []*crm.ContractServiceAndDetail) (checkPermissionIdMap map[int]int, err error) {
+func GetServicePermissionMap(serviceList []*crm.ContractServiceAndDetailRespItem) (checkPermissionIdMap map[int]int, err error) {
 	checkPermissionIdMap = make(map[int]int)
 
 	// 获取品种分类配置