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

zss

昨天 afacb4a693c3b7e40ccdd55bc403850709ff8a34

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

@@ -33,4 +33,15 @@

    @ApiModelProperty(value = "未回款金额")
    private BigDecimal unReceiptPaymentAmount;

    @ApiModelProperty(value = "税率")
    private BigDecimal taxRate;

    @ApiModelProperty(value = "销售合同号")
    private String salesContractNo;

    @ApiModelProperty(value = "销售合同ID")
    private Integer salesLedgerId;

    private String paymentMethod;
}