From 2ed572d6b2a4be6b91b3e2a1ed48485abde91553 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 15 Jul 2024 10:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into rb-copy
---
src/main/java/com/nq/pojo/StockSubscribe.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nq/pojo/StockSubscribe.java b/src/main/java/com/nq/pojo/StockSubscribe.java
index 9319a0b..db40aaa 100644
--- a/src/main/java/com/nq/pojo/StockSubscribe.java
+++ b/src/main/java/com/nq/pojo/StockSubscribe.java
@@ -63,7 +63,6 @@
/**
* 申购截至日期
*/
-// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date subscribeTime;
@@ -75,7 +74,6 @@
/**
* 中签日期
*/
-// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date subscriptionTime;
@@ -89,4 +87,6 @@
* 是否上市
*/
private static final long serialVersionUID = 1L;
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3