From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/models/DepotConf.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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..4839449 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();
@@ -76,16 +84,20 @@
private int cableEnd;
@Column(name = "START_ORIENTATION_", length = 20)
- @PropertyDef(label = "鐢电紗寮�濮嬫柟浣�", description = "榛樿鍙宠竟(鍙宠竟銆佸彸涓娿�佸乏杈广�佸乏涓�)")
+ @PropertyDef(label = "鐢电紗璧峰鏂逛綅", description = "榛樿鍙宠竟(鍙宠竟銆佸彸涓娿�佸乏杈广�佸乏涓�)")
private String startOrientation = Constant.GRAIN_START_ORIENTATION_RIGHT;
@Column(name = "START_DIRECTION_", length = 20)
- @PropertyDef(label = "鐢电紗寮�濮嬫柟鍚�", description = "榛樿绾靛悜(绾靛悜銆佹í鍚�)")
+ @PropertyDef(label = "鐢电紗璧峰鏂瑰悜", description = "榛樿绾靛悜(绾靛悜銆佹í鍚�)")
private String startDirection = Constant.GRAIN_START_DIRECTION_PORTRAIT;
@Column(name = "START_POINT_", length = 20)
- @PropertyDef(label = "鐢电紗寮�濮嬬偣浣�", description = "榛樿椤堕儴(椤堕儴銆佸簳閮�)")
+ @PropertyDef(label = "鐢电紗璧峰鐐逛綅", description = "榛樿椤堕儴(椤堕儴銆佸簳閮�)")
private String startPoint = Constant.GRAIN_START_POINT_TOP;
+
+ @Column(name = "START_CONVERT_", length = 20)
+ @PropertyDef(label = "灞傝杞崲", description = "榛樿涓嶈浆鎹�(榛樿銆侀『鏃堕拡銆侀�嗘椂閽�)")
+ private String startConvert = Constant.GRAIN_CONVERT_DEFAULT;
@Column(name = "TEMP_MAX_")
@PropertyDef(label = "娓╁害涓婇檺")
@@ -126,7 +138,6 @@
@Column(name = "PEST_MAX_")
@PropertyDef(label = "铏涓婇檺")
private Double pestMax;
-
// 浠撳簱鍚嶇О
@Transient
--
Gitblit v1.9.3