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

liding

7 天以前 db85e062349683b3131726fe90dcc99d4aff35ba

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

@@ -42,4 +42,6 @@

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

    private String paymentMethod;
}