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

liding

6 天以前 1284fb157043e488aa1794d8f1b64ebf18aa5147

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

@@ -19,6 +19,11 @@
    @Excel(name = "客户合同号")
    private String customerContractNo;

    @ApiModelProperty(value = "状态")
    @Excel(name = "状态")
    private String statusName;


    @ApiModelProperty(value = "客户名称")
    @Excel(name = "客户名称")
    private String customerName;