From 5fb14bb0d28210f69c07021441b2cdd76aa46fe5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 04 九月 2023 17:58:24 +0800
Subject: [PATCH] 原材料检验修改9-4 3.0

---
 standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java
index c1754bd..fdf1c47 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/Technology.java
@@ -34,30 +34,37 @@
     @ApiModelProperty(value = "宸ヨ壓鍚嶇О")
     private String name;
 
-    private String quota;
+    @ApiModelProperty(value = "鐖剁骇")
+    private String father;
 
     @ApiModelProperty(value = "璁惧缁�")
     private String deviceGroup;
 
+    @ApiModelProperty(value = "鍏宠仈 鍨嬪彿id")
+    private Integer specificationsId;
+
+    @ApiModelProperty(value = "鐢熶骇瀹氶(涓�/澶�)")
+    private Integer productionQuota;
+
+    /**
+     * 鐗堟湰
+     **/
+    private Integer version;
+
     @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝e父>=1,鍒犻櫎<=0", hidden = true)
-    @TableLogic(value = "1", delval = "0")
     private Integer state;
 
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
 
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date updateTime;
 
-    @ApiModelProperty(value = "鍏宠仈 瑙勬牸id")
-    private Integer specificationsId;
 
-    @ApiModelProperty(value = "鍏宠仈 璁惧id")
-    private Integer deviceId;
 
 
 }

--
Gitblit v1.9.3