Merge branch 'crm/crm_16.6' into debug

models/roadshow/calendar_researcher_question.go

@@ -35,6 +35,14 @@ func RoadShowQuestionSave(req *RoadShowQuestionSaveReq) (err error) {
 		return err
 	}
 
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+
 	sql := ` UPDATE rs_calendar_researcher SET company_industry = ?,company_classify = ?,question_status=1 WHERE rs_calendar_researcher_id = ? `
 	_, err = tx.Raw(sql, req.CompanyIndustry, req.CompanyClassify, req.RsCalendarResearcherId).Exec()
 	if err != nil {