Merge branch 'feature/pool0109_company_seller' of hongze/hz_crm_api into master

models/company/company.go

@@ -362,6 +362,8 @@ as sort_todo_end_time,
             b.freeze_time,b.freeze_reason,b.renewal_reason,
 			b.view_total,
 			b.last_view_time,
+			a.share_seller,
+			a.share_seller_id,
 			MAX(b.last_view_time) as max_last_view_time,
 			MIN(b.last_view_time) as min_last_view_time,
 			MAX(b.end_date) as max_end_date,

services/statistic_report/company.go

@@ -555,6 +555,8 @@ func CompanyList(sysUser *system.Admin, req statisticModels.IncrementalCompanyLi
 				Deadline:        tmpDeadline,
 				IsShow:          isShow,
 				TryStageSlice:   tryStageSlice,
+				ShareSellerId:   v.ShareSellerId,
+				ShareSeller:     v.ShareSeller,
 			}
 			if strings.Contains(companyList.ApproveStatus, "已审批") {
 				companyList.ApproveStatus = ""

services/statistic_report/reponse.go

@@ -148,6 +148,8 @@ type CompanyListItem struct {
 	TryStageSlice    []company.TryStageSliceItem `description:"试用状态相关"`
 	FiccTryOutDay    int                         `description:"Ficc总试用天数"`
 	RaiTryOutDay     int                         `description:"权益总试用天数"`
+	ShareSellerId    int                         `description:"分配的咨询组销售ID"`
+	ShareSeller      string                      `description:"分配的咨询组销售名称"`
 }
 
 // CompanyRenewRecordResp 总统计信息