Merge branch 'dev_New' into dev_New_kthg

zss

2026-02-06 d5dc454e86e78abd6ca859bb9b0a4c096d743b3b

 src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java

@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
import org.apache.ibatis.annotations.Mapper;