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

gongchunyi

6 天以前 780d2ae86cc0c4ebd42922f649bf557f1f17cd62

 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;