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

zss

22 小时以前 599b5ff692722226d1e30fbdffc594b826bfa815

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

@@ -44,7 +44,7 @@

    @ApiModelProperty(value = "销售台账sales_ledger")
    @Excel(isExport = false)
    private Integer salesLedgerId;
    private Long salesLedgerId;

    @ApiModelProperty(value = "销售合同号")
    @Excel(name = "销售合同号")