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

buhuazhen

10 天以前 b7eb6e87b4d88e5a419b64e3e3d0e5dc1be0f48f

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

@@ -9,7 +9,7 @@
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.io.IOException;

public interface IDeviceLedgerService  extends IService<DeviceLedger> {
    IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger);
@@ -20,5 +20,5 @@

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

    Boolean importData(MultipartFile file);
    Boolean importData(MultipartFile file) throws IOException;
}