From 803697bd4f3ac5262e0acd69d6d7cc519ec45b2a Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 04 九月 2023 10:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-core/src/main/java/com/ld/igds/models/DepotConf.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/models/DepotConf.java b/igds-core/src/main/java/com/ld/igds/models/DepotConf.java
index ef59d56..aee0f85 100644
--- a/igds-core/src/main/java/com/ld/igds/models/DepotConf.java
+++ b/igds-core/src/main/java/com/ld/igds/models/DepotConf.java
@@ -47,6 +47,14 @@
     @PropertyDef(label = "姘斾綋鍒嗘満")
     private String gasSer;
 
+    @Column(name = "PEST_SER_", length = 40)
+    @PropertyDef(label = "姘斾綋鍒嗘満")
+    private String pestSer;
+
+    @Column(name = "VERB_SER_", length = 40)
+    @PropertyDef(label = "閫氶鍒嗘満")
+    private String verbSer;
+
     @Column(name = "GRAIN_FREQ_", length = 4)
     @PropertyDef(label = "绮儏淇濆瓨棰戠巼", description = "榛樿涓�澶╁娆�")
     private String grainFreq = GrainFrequence.FREQ_01.getCode();
@@ -126,7 +134,6 @@
     @Column(name = "PEST_MAX_")
     @PropertyDef(label = "铏涓婇檺")
     private Double pestMax;
-
 
     // 浠撳簱鍚嶇О
     @Transient

--
Gitblit v1.9.3