合并冲突

models/cloud_disk_resource.go

@@ -303,10 +303,6 @@ func toCloudDiskResourceList(items []*CloudDiskResource) (resourceList []*CloudD
 	return
 }
 func GetCloudDiskResourceList(resourceCond string, resourcePars []interface{}) (resourceList []*CloudDiskResourcePageItem, err error) {
-<<<<<<< HEAD
-=======
-	//o := orm.NewOrm()
->>>>>>> feature/eta355_cloud_file_move_modify
 	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
@@ -324,9 +320,5 @@ func BatchMoveCloudDiskResource(menuId int, resourceIds []int) (err error) {
 	}
 	sql := `UPDATE cloud_disk_resource SET menu_id = ?  WHERE resource_id IN (` + utils.GetOrmInReplace(resourceLens) + `)`
 	err = global.DEFAULT_DB.Exec(sql, menuId, resourceIds).Error
-<<<<<<< HEAD
-
-=======
->>>>>>> feature/eta355_cloud_file_move_modify
 	return
 }