Merge branch 'CRM_14.7.2' into debug

# Conflicts:
#	models/company/company.go

controllers/company.go

@@ -1718,7 +1718,7 @@ func (this *CompanyController) List() {
 				RenewalReason:    v.RenewalReason,
 				FreezeReason:     v.FreezeReason,
 				LossTime:         v.LossTime,
-				Status:           v.Status,
+				Status:           v.StatusStr,
 				CompanyType:      v.CompanyType,
 				ApproveStatus:    v.ApproveStatus,
 				SellerName:       v.SellerName,

controllers/full_company.go

@@ -1231,7 +1231,7 @@ func (this *FullCompanyController) List() {
 				RenewalReason:    v.RenewalReason,
 				FreezeReason:     v.FreezeReason,
 				LossTime:         v.LossTime,
-				Status:           v.Status,
+				Status:           v.StatusStr,
 				CompanyType:      v.CompanyType,
 				ApproveStatus:    v.ApproveStatus,
 				SellerName:       v.SellerName,

models/company/company.go

@@ -160,6 +160,7 @@ type CompanyItem struct {
 	FreezeReason        string `description:"冻结理由"`
 	LossTime            string `description:"流失时间"`
 	Status              string `description:"客户状态：'试用','永续','冻结','流失','正式' "`
+	StatusStr       	string `description:"客户状态：'试用','永续','冻结','流失','正式' 如果是共享客户会加上 '(共享)'" `
 	CompanyType         string `description:"客户类型：ficc/权益"`
 	ApproveStatus       string `description:"审批状态：'待审批','已审批','驳回' 审批状态为空时，表示没有审批申请"`
 	SellerName          string `description:"销售：吉根龙/颖丹"`
@@ -358,7 +359,8 @@ as sort_todo_end_time,
 			GROUP_CONCAT(CASE 
             WHEN b.is_share = 1 THEN CONCAT(b.status, '(共享)')
             ELSE b.status 
-        END ORDER BY b.product_id ASC SEPARATOR '/') AS status,
+        END ORDER BY b.product_id ASC SEPARATOR '/') AS status_str,
+			GROUP_CONCAT(b.status ORDER BY b.product_id ASC SEPARATOR '/') AS status,
 			GROUP_CONCAT(DISTINCT b.seller_name ORDER BY b.product_id ASC SEPARATOR '/') AS seller_name,
 			GROUP_CONCAT(DISTINCT b.seller_id ORDER BY b.product_id ASC SEPARATOR '/') AS seller_ids,
 			GROUP_CONCAT(DISTINCT b.package_type ORDER BY b.product_id ASC SEPARATOR '/') AS package_types,