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

liyong

7 天以前 f5ee8e7afb178179c1d1d078cf42fe33dc7607f9

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

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import org.springframework.web.multipart.MultipartFile;

import jakarta.servlet.http.HttpServletResponse;
@@ -14,9 +14,9 @@
public interface IDeviceLedgerService  extends IService<DeviceLedger> {
    IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger);

    AjaxResult saveDeviceLedger(DeviceLedger deviceLedger);
    R<?> saveDeviceLedger(DeviceLedger deviceLedger);

    AjaxResult updateDeviceLedger(DeviceLedger deviceLedger);
    R<?> updateDeviceLedger(DeviceLedger deviceLedger);

    void export(HttpServletResponse response, Long[] ids);