Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro

yuan

2026-05-20 d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1

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

@@ -8,7 +8,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;

public interface ISupplierService extends IService<SupplierManage> {