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

云

7 天以前 af6ffc009f92628023d183ffd4971e7e60084ecd

 src/main/java/com/ruoyi/basic/service/ISupplierService.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.framework.web.domain.R;
import org.springframework.web.multipart.MultipartFile;

import jakarta.servlet.http.HttpServletResponse;
@@ -55,5 +56,5 @@
     */
    void supplierExport(HttpServletResponse response, SupplierManageDto supplierManageDto);

    Boolean importData(MultipartFile file);
    R importData(MultipartFile file);
}