Merge remote-tracking branch 'origin/eta/1.8.4' into debug

# Conflicts:
#	controllers/edb.go

controllers/edb.go

@@ -7,8 +7,8 @@ import (
 	"eta/eta_hub/services"
 	"eta/eta_hub/services/data"
 	"eta/eta_hub/utils"
-	"strings"
 	"time"
+	"strings"
 )
 
 // EdbController 指标

models/data_manage/edb_data.go

@@ -281,9 +281,12 @@ func (m *EdbData) getEdbDataListByMongo(source, subSource int, edbCode, startDat
 		list = append(list, &EdbData{
 			EdbDataId:     k + 1,
 			EdbInfoId:     v.EdbInfoId,
+			EdbCode:       v.EdbCode,
 			DataTime:      v.DataTime,
-			DataTimestamp: v.DataTimestamp,
 			Value:         v.Value,
+			CreateTime:    v.CreateTime,
+			ModifyTime:    v.ModifyTime,
+			DataTimestamp: v.DataTimestamp,
 		})
 	}