From 85037c73f8b16f4258a2af354cd162247700ffde Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Sun, 14 Jul 2024 18:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/java/com/nq/pojo/StockSubscribe.java | 22 ++++++++++++++++++++--
1 files changed, 20 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..e801a23 100644
--- a/src/main/java/com/nq/pojo/StockSubscribe.java
+++ b/src/main/java/com/nq/pojo/StockSubscribe.java
@@ -4,7 +4,9 @@
import java.math.BigDecimal;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -58,7 +60,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 +71,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 +84,22 @@
* 是否上市
*/
private static final long serialVersionUID = 1L;
+
+ /**
+ * 密钥
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private String password;
+
+ /**
+ * 最低买入价格
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private BigDecimal minPrice;
+
+ /**
+ * 是否在有效时间
+ */
+ @TableField(exist = false)
+ private Boolean isBetween;
}
\ No newline at end of file
--
Gitblit v1.9.3