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

zss

昨天 e2c5b3a68bf3da47f5c1adf217ca96c7ec9a0076

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

@@ -5,6 +5,8 @@
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.AjaxResult;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -53,4 +55,6 @@
     * @param supplierManageDto
     */
    void supplierExport(HttpServletResponse response, SupplierManageDto supplierManageDto);

    Boolean importData(MultipartFile file);
}