From 9f4d96b920b842ecf7b4149b7c85b980dcbb3613 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 07 三月 2025 10:40:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java index 5c30783..9d5440a 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java @@ -71,11 +71,11 @@ @ApiModelProperty(value = "寮�濮嬫椂闂�") @TableField(exist = false) - private Date startTime; + private String startTime; @ApiModelProperty(value = "骞存湀鏃堕棿") @TableField(exist = false) private String timeInfoStr; @ApiModelProperty(value = "寮�濮嬫椂闂�") @TableField(exist = false) - private Date endTime; + private String endTime; } -- Gitblit v1.9.3