Merge remote-tracking branch 'origin/master' into pim_yys

maven

3 天以前 0ce689b428cf9ceb58972db2bdd42a1a176f8f20

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

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

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

    private String paymentMethod;
}