Merge branch 'crm/crm_16.0' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/roadshow/company.go

@@ -59,8 +59,8 @@ func (this *CalendarController) CompanySearch() {
 // @Title 我的日历列表
 // @Description 我的日历列表接口
 // @Param   CompanyId   query   int  true       "公司id"
-// @Param   CompanyType   query   string  true       "客户类型：'ficc','权益',传空默认为ficc,"
 // @Param   EnglishCompany   query   int  true       "是否为英文客户"
+// @Param   CompanyType   query   string  true       "客户类型：'ficc','权益',传空默认为ficc,"
 // @Success 200 {object} roadshow.CompanyDetailView
 // @router /company/detail [get]
 func (this *CalendarController) CompanyDetail() {