合并冲突

models/cloud_disk_resource.go

@@ -4,7 +4,6 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"gorm.io/gorm"
 	"strings"
@@ -307,7 +306,7 @@ func GetCloudDiskResourceList(resourceCond string, resourcePars []interface{}) (
 	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT resource_id , resource_name, resource_suffix, menu_id, size, admin_name, create_time FROM cloud_disk_resource WHERE 1=1 %s `, resourceCond)
 	var ormList []*CloudDiskResource
-	err = global.DEFAULT_DB.Raw(sql, resourcePars).Find(&ormList).Error
+	err = global.DEFAULT_DB.Raw(sql, resourcePars...).Find(&ormList).Error
 	if err != nil {
 		return
 	}