feat:合并

api/application.api

@@ -28,11 +28,7 @@ type (
 		User         []int64 `json:"user,optional"`         //企业用户id
 		EmployInfoId int64   `json:"employInfoId,optional"` //资讯收录id
 		CreateName   string  `json:"createName"`            //创建人
-<<<<<<< HEAD
 		Channel      string  `json:"channel"`               //渠道来源：网页、手动创建
-=======
-		Channel      string  `json:"channel"`               //来源
->>>>>>> master
 	}
 	SaleChanceReq {
 		AppId             string  `header:"appId,default=10000"`
@@ -197,46 +193,46 @@ service crmApplication {
 	@doc "添加线索"
 	@handler clueAdd
 	post /crmApplication/clue/add (ClueAddReq) returns (Reply)
-
+	
 	@doc "创建销售机会"
 	@handler saleChanceAdd
 	post /crmApplication/saleChance/add (SaleChanceReq) returns (Reply)
-
+	
 	@doc "收录操作"
 	@handler employOperate
 	post /crmApplication/employ/operate (EmployOperateReq) returns (Reply)
-
+	
 	@doc "商业资讯的转办"
 	@handler transfer
 	post /crmApplication/information/transfer (TransferReq) returns (Reply)
-
+	
 	@doc "忽略操作"
 	@handler ignoreOperate
 	post /crmApplication/ignore/operate (IgnoreOperateReq) returns (Reply)
-
+	
 	@doc "收录情况"
 	@handler employInfo
 	post /crmApplication/employ/info (InfoEmployinfoReq) returns (InfoReply)
 	@doc "创建客户"
 	@handler customAdd
 	post /crmApplication/custom/add (CustomAddReq) returns (Reply)
-
+	
 	@doc "文件上传"
 	@handler fileUpload
 	post /crmApplication/file/upload (FileUploadReq) returns (Reply)
-
+	
 	@doc "分发"
 	@handler employDistribute
 	post /crmApplication/employ/distribute (EmployDistributeReq) returns (Reply)
-
+	
 	@doc "企业详情"
 	@handler entinfo
 	post /crmApplication/ent/info (EntInfoReq) returns (Reply)
-
+	
 	@doc "消息推送"
 	@handler pushMsg
 	post /crmApplication/info/push (PushMsgReq) returns (Reply)
-
+	
 	@doc "是否可以创建"
 	@handler canAddReq
 	post /crmApplication/info/canAdd (CanAddReq) returns (Reply)

api/internal/types/types.go

@@ -30,11 +30,7 @@ type ClueAddReq struct {
 	User         []int64 `json:"user,optional"`         //企业用户id
 	EmployInfoId int64   `json:"employInfoId,optional"` //资讯收录id
 	CreateName   string  `json:"createName"`            //创建人
-<<<<<<< HEAD
 	Channel      string  `json:"channel"`               //渠道来源：网页、手动创建
-=======
-	Channel      string  `json:"channel"`               //来源
->>>>>>> master
 }
 
 type SaleChanceReq struct {