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

zss

昨天 e2c5b3a68bf3da47f5c1adf217ca96c7ec9a0076

 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;

}