Merge branch 'crm/crm_16.6' into debug

controllers/roadshow/calendar_researcher_question.go

@@ -394,8 +394,8 @@ func (this *CalendarController) CalendarSummaryExport() {
 		dataRow.AddCell().SetString(v.CompanyClassify)
 		questionList := questionMap[v.RsCalendarId]
 		for _, qv := range questionList {
-			titleRow.AddCell().SetString(qv.QuestionContent)
-			titleRow.AddCell().SetString(qv.ReplyContent)
+			dataRow.AddCell().SetString(qv.QuestionContent)
+			dataRow.AddCell().SetString(qv.ReplyContent)
 		}
 	}
 

controllers/roadshow/company.go

@@ -118,13 +118,9 @@ func (this *CalendarController) CompanyDetail() {
 	}
 
 	if _, ok := ficcSellerMap[sellerId]; ok {
-		if productId != 1 {
-			productId = 1
-		}
+		productId = 1
 	} else {
-		if productId != 2 {
-			productId = 2
-		}
+		productId = 2
 	}
 
 	detailView := new(roadshow.CompanyDetailView)