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

jiangping

2025-02-17 0c5af76b83fe0d3e12092667dd598fb4740df879

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

@@ -18,7 +18,7 @@
 */
@Data
@ApiModel("")
@TableName("`ali_bill_detail`")
@TableName("\"ali_bill_detail\"")
public class AliBillDetail {

    @ApiModelProperty(value = "")
@@ -31,7 +31,7 @@

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

    @ApiModelProperty(value = "商户号")