Merge branch 'eta/1.1.6' into debug

controllers/data_manage/edb_info.go

@@ -4341,6 +4341,7 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 		dataList[i], dataList[j] = dataList[j], dataList[i]
 	}
 
+	resp.List = dataList
 	// 前端不传入日期的时候，这个J皮不让返回这个字段，要不然他会颜色标记
 	if date != `` {
 		resp.Date = currDate