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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java

@@ -50,4 +50,11 @@
    @Excel(name = "供应商名称")
    private String supplierName;

    /**
     * 供应商id
     */
    private Long supplierId;

    private Integer approvalStatus;

}