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

云

2026-04-22 f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1

 src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java

@@ -7,7 +7,7 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.framework.web.domain.AjaxResult;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;

public interface IDeviceMaintenanceService extends IService<DeviceMaintenance> {