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/PricingParam.java

@@ -54,12 +54,12 @@

    @ApiModelProperty(value = "开始时间")
    @ExcelColumn(name="开始时间")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date startDate;

    @ApiModelProperty(value = "结束时间")
    @ExcelColumn(name="结束时间")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date endDate;

    @ApiModelProperty(value = "优先级（升序）", example = "1")