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

jiangping

2025-02-21 1147614053efae0314a36c15293a6a5ed4e6d737

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

@@ -31,7 +31,7 @@

    @ApiModelProperty(value = "交易时间")
    @ExcelColumn(name="交易时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    private Date billDate;

    @ApiModelProperty(value = "商户号")