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 |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nq/pojo/StockSubscribe.java b/src/main/java/com/nq/pojo/StockSubscribe.java
index 0d1ea3e..db40aaa 100644
--- a/src/main/java/com/nq/pojo/StockSubscribe.java
+++ b/src/main/java/com/nq/pojo/StockSubscribe.java
@@ -48,6 +48,11 @@
     private Long orderNumber;
 
     /**
+     * 最低数量
+     */
+    private Long minOrderNumber;
+
+    /**
      * 顯示状态
      */
     private Integer zt;
@@ -58,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;
 
@@ -70,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;
 
@@ -84,4 +87,6 @@
      * 是否上市
     */
     private static final long serialVersionUID = 1L;
+
+
 }
\ No newline at end of file

--
Gitblit v1.9.3