Merge branch 'bugfix_3194' into debug

controllers/data_manage/edb_info.go

@@ -2967,7 +2967,7 @@ func (this *ChartInfoController) EdbInfoData() {
 	edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 	if err != nil {
 		br.Msg = "获取失败"
-		br.Msg = "获取失败,Err:" + err.Error()
+		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
 	maxYear := 0
@@ -2980,7 +2980,7 @@ func (this *ChartInfoController) EdbInfoData() {
 	dataList, err := data_manage.GetEdbDataList(edbInfo.Source, edbInfoId, startDate, endDate)
 	if err != nil {
 		br.Msg = "获取失败"
-		br.Msg = "获取失败,Err:" + err.Error()
+		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
 	resp := new(data_manage.EdbInfoDataResp)