Merge branch 'pool/198' into debug

models/chart.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"eta/eta_chart_lib/models/mgo"
 	"eta/eta_chart_lib/utils"
-	"eta/eta_chart_lib/utils/mgodb"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"go.mongodb.org/mongo-driver/bson"
@@ -211,7 +210,7 @@ func getEdbDataListByMongo(source, subSource, edbInfoId int, startDate, endDate
 		"edb_info_id": edbInfoId,
 	}
 	// 日期
-	dateCondition, err := mgodb.BuildDateCondition(startDate, endDate)
+	dateCondition, err := mgo.BuildDateCondition(startDate, endDate)
 	if err != nil {
 		return
 	}

utils/mgodb/common.go → models/mgo/common.go

@@ -1,4 +1,4 @@
-package mgodb
+package mgo
 
 import (
 	"eta/eta_chart_lib/utils"