From 4529041089b80a473a6bd4025a2c9770458f203a Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 25 六月 2024 17:36:00 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java
index 4eb2270..f6c9251 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java
@@ -127,10 +127,10 @@
@Excel(name = "鏄惁鍒犻櫎")
private String isDeleted;
- @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date endTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date startTime;
public Date getStartTime() {
@@ -160,7 +160,7 @@
return url;
}
- public void settianUrl(String url) {
+ public void setUrl(String url) {
this.url = url;
}
--
Gitblit v1.9.1