Merge branch 'dm' of http://8.136.199.33:3000/eta_gn_server/eta_api into dm

models/data_manage/edb_info.go

@@ -806,11 +806,10 @@ func GetEdbInfoAllCalculateByEdbInfoIdList(edbInfoIdList []int) (list []*EdbInfo
 		return
 	}
 
-	sql := ` SELECT b.* FROM edb_info_calculate_mapping AS a
+	sql := ` SELECT DISTINCT b.* FROM edb_info_calculate_mapping AS a
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
              WHERE a.from_edb_info_id in (` + utils.GetOrmInReplace(num) + `)
-			 GROUP BY a.edb_info_id
-			 ORDER BY a.edb_info_id ASC `
+			 ORDER BY b.edb_info_id ASC `
 	err = global.DmSQL["data"].Raw(sql, edbInfoIdList).Scan(&list).Error
 
 	return