Merge remote-tracking branch 'origin/master'

nickchange

2023-11-15 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83

 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;