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

liyong

昨天 2329f548c36876a59a7808e8c96466e94e088350

 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 = "销售合同号")