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

yaowanxin

昨天 dcf2c669cac48202ceea2d6917dff89b9a84cb95

 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;
}