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/StockDz.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nq/pojo/StockDz.java b/src/main/java/com/nq/pojo/StockDz.java
index 928ee81..c0c780a 100644
--- a/src/main/java/com/nq/pojo/StockDz.java
+++ b/src/main/java/com/nq/pojo/StockDz.java
@@ -1,8 +1,6 @@
 package com.nq.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -40,7 +38,7 @@
     private BigDecimal increaseRatio;
 
     private Integer stockNum;
-
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String password;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
@@ -49,5 +47,11 @@
     private BigDecimal discount;
     private Integer period;
 
+    /**
+     * 大宗审核开关(0:关闭  1:打开)
+     */
+    private Integer switchType = 0;
     private static final long serialVersionUID = 1L;
+    //价格
+    private BigDecimal nowPrice;
 }
\ No newline at end of file

--
Gitblit v1.9.3