Merge branch 'refs/heads/dev_New' into dev_New_kthg

liding

12 小时以前 1a3f5db043fd381b60a0a5f40687136274a2cbd1

 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;

}