Merge branch 'fix/2023-10-10' into debug

controllers/data_manage/edb_info_calculate.go

@@ -242,11 +242,11 @@ func (this *ChartInfoController) CalculateDetail() {
 		if aEdbInfo != nil && bEdbInfo != nil {
 			edbInfoFromTagList := []data_manage.EdbInfoFromTag{
 				{
-					EdbInfoId: aEdbInfo.EdbInfoId,
+					EdbInfoId: aEdbInfo.FromEdbInfoId,
 					FromTag:   aEdbInfo.FromTag,
 					MoveValue: aEdbInfo.MoveValue,
 				}, {
-					EdbInfoId: bEdbInfo.EdbInfoId,
+					EdbInfoId: bEdbInfo.FromEdbInfoId,
 					FromTag:   bEdbInfo.FromTag,
 					MoveValue: bEdbInfo.MoveValue,
 				},

controllers/data_manage/predict_edb_info.go

@@ -988,11 +988,11 @@ func (this *PredictEdbInfoController) Detail() {
 		if aEdbInfo != nil && bEdbInfo != nil {
 			edbInfoFromTagList := []data_manage.EdbInfoFromTag{
 				{
-					EdbInfoId: aEdbInfo.EdbInfoId,
+					EdbInfoId: aEdbInfo.FromEdbInfoId,
 					FromTag:   aEdbInfo.FromTag,
 					MoveValue: aEdbInfo.MoveValue,
 				}, {
-					EdbInfoId: bEdbInfo.EdbInfoId,
+					EdbInfoId: bEdbInfo.FromEdbInfoId,
 					FromTag:   bEdbInfo.FromTag,
 					MoveValue: bEdbInfo.MoveValue,
 				},