合并冲突问题，需要核对

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

@@ -5,11 +5,14 @@ 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;
+
 /**
 * @date 2023-12-19 13:43:38
 * @author xucaiqin
@@ -28,4 +31,14 @@ public interface IotProjectMapper extends BaseMapper<IotProject> {
     IotProjectVo detail(@Param("id") Long id);
 
     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);
+
+}

iot-module/iot-module-manage/iot-module-manage-biz/src/main/resources/mapper/IotProjectMapper.xml

@@ -97,4 +97,5 @@
             id = #{changeStatus.id,jdbcType=BIGINT}
         </where>
     </update>
-</mapper>
+
+</mapper>