Merge branch 'cygx/cygx_14_6' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_permission.go

@@ -482,9 +482,10 @@ func (this *CompanyPermissionController) PermissionLook() {
 
 	var filterPermissionName []string
 	if lookType == 1 {
-		filterPermissionName = []string{"专家", "路演服务", "研选扣点包", "调研"}
+		//filterPermissionName = []string{"专家", "路演服务", "研选扣点包", "调研"}
+		filterPermissionName = utils.FilterPermissionNameRai
 	} else {
-		filterPermissionName = []string{"调研"}
+		filterPermissionName = []string{"海外调研"}
 	}
 	//权益权限类目
 	for _, v := range permissionArr {

models/cygx/activity_signup.go

@@ -95,6 +95,7 @@ type CygxAppointmentList struct {
 	SignupType          int    `description:"报名方式，1预约外呼，2自主拨入，3我要报名"`
 	YidongExamineStatus int    `description:"易董活动报名审核状态0审核中，1：审核通过、2审核不通过"`
 	Email               string `description:"邮箱"`
+	ThreeSource         int    `description:"三方来源，1进门财经"`
 }
 
 type CygxSignupUser struct {