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

yaowanxin

2 天以前 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09

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

@@ -44,4 +44,17 @@
     */
    private Boolean status;

    /**
     * 供应商名称
     */
    @Excel(name = "供应商名称")
    private String supplierName;

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

    private Integer approvalStatus;

}