合并冲突问题，需要核对

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/mapper/IotProjectMapper.java

@@ -5,12 +5,8 @@ import com.middle.platform.manage.biz.domain.req.ChangeStatus;
 import com.middle.platform.manage.biz.domain.req.ProjectPage;
 import com.middle.platform.manage.biz.domain.vo.IotProjectVo;
 import com.middle.platform.manage.biz.entity.IotProject;
-import com.middle.platform.manage.biz.domain.vo.req.IotDeviceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
 import java.util.List;
 
 /**
@@ -32,13 +28,5 @@ public interface IotProjectMapper extends BaseMapper<IotProject> {
 
     int changeStatus(@Param("changeStatus") ChangeStatus changeStatus);
 
-    /**
-     * update record
-     * @param record the updated record
-     * @return update count
-     */
-    int updateByPrimaryKey(IotProject record);
-
-    List<IotProject> select(IotDeviceVo params);
 
 }