From 844ffa2181d698f3871a62553fe10dd4054b63fa Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 29 八月 2023 10:23:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java b/base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java
index e7dc98f..8ebdd82 100644
--- a/base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java
+++ b/base-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java
@@ -62,10 +62,6 @@
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date updateTime;
 
-    /**
-     * 鍏冧欢0:鎻掑ご1:鎻掍欢
-     **/
-    private String element;
 
     /**
      * 璁惧缁�

--
Gitblit v1.9.3