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

jiangping

2023-12-20 9d9e3e3f45406bb1a08981b159b50deb0d102e57

 server/services/src/main/java/com/doumee/dao/business/model/Transactions.java

@@ -77,7 +77,7 @@

    @ApiModelProperty(value = "交易完成时间")
    @ExcelColumn(name="交易完成时间")
    private String doneDate;
    private Date doneDate;

    @ApiModelProperty(value = "交易标题")
    @ExcelColumn(name="交易标题")