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

mitao

2025-03-31 51f26723bee741bf112c8d0d965d0e2f2974bd04

 cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/model/BillingDataRequestVo.java

@@ -10,10 +10,10 @@
public class BillingDataRequestVo {

    @ApiModelProperty(value = "开始时间")
    private Date monthStart = null;
    private String monthStart = null;

    @ApiModelProperty(value = "结束时间时间")
    private Date monthEnd = null;
    private String monthEnd = null;

    @ApiModelProperty(value = "用户id")
    private Integer appUserId;