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

mitao

2025-03-31 060b84c46d7097696504aea89f77185320815b07

 cloud-server-other/src/main/java/com/dsh/other/feignclient/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;