Merge remote-tracking branch 'origin/dev_New' into hsxny-new

maven

9 天以前 1f1ef0f62c4953e3ff9c610cda8f3c4f8a45c025

 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;