From 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 六月 2024 19:41:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/model/BillingDataRequestVo.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/model/BillingDataRequestVo.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/model/BillingDataRequestVo.java
index f63861f..3514fee 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/model/BillingDataRequestVo.java
+++ b/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;
--
Gitblit v1.7.1