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

k94314517

2024-11-29 d1c205d29b5eacf1de22a7af29329ca370d1c2d3

 server/service/src/main/java/com/doumee/dao/business/dto/CountCyclePriceDTO.java

@@ -1,5 +1,6 @@
package com.doumee.dao.business.dto;

import com.doumee.dao.business.model.Solutions;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,5 +22,8 @@
    @ApiModelProperty(value = "生效起期")
    private Date startDate;

    @ApiModelProperty(value = "方案", example = "1")
    private Solutions solutions;


}