Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

gongchunyi

2 天以前 d29080af4e965ba341cb85a5bc45ecd183c06783

 src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java

@@ -54,7 +54,7 @@
    @Excel(name = "销售订单号")
    private String salesContractNo;

    @Schema(description = "待收款金额")
    @Schema(description = "已收款金额")
    @ExcelIgnore
    private BigDecimal amountReceived;
}