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

gongchunyi

2 天以前 f81364e8bfbede8de723c708eee8060cb2c63b83

 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;

}