From f343ea865c01b9645cb386b2d2bad159f87efde3 Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Wed, 8 May 2019 18:40:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=92=8C=E7=A1=AC?=
 =?UTF-8?q?=E4=BB=B6=E9=80=82=E9=85=8D=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-pojo-andon/pom.xml                       | 17 +++++++++++++++++
 .../estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java |  6 ++++--
 modules/i3plus-pojo-lac/pom.xml                         | 17 +++++++++++++++++
 pom.xml                                                 |  2 ++
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 modules/i3plus-pojo-andon/pom.xml
 create mode 100644 modules/i3plus-pojo-lac/pom.xml

diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
new file mode 100644
index 0000000..c31090b
--- /dev/null
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-andon</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>
\ No newline at end of file
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index 6c19f95..43adf39 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -28,8 +28,10 @@ public class CommonEnumUtil {
         REPORT(21,"block-report","智能报表"),
         WORKFLOW(22,"block-workflow","智能工作流"),
         JOBFLOW(23,"block-jobflow","智能作业流"),
-        SOFTSWITCH(24,"block-softswitch","智能软件适配器"),
-        HARDSWITCH(25,"block-hardswitch","智能硬件适配器"),
+        SOFTSWITCH(24,"block-softswitch","软件适配器"),
+        HARDSWITCH(25,"block-hardswitch","硬件适配器"),
+        LAC(26,"link-connect","连接适配器"),
+        ANDON(27,"andon","安灯"),
         CENTER(99,"icloud-server","注册中心"),
         SURFACE(98,"i3surface","对外服务"),
         CLOUD(97,"i3cloud","微服务"),
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
new file mode 100644
index 0000000..3681eb6
--- /dev/null
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-lac</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e5f0bb0..1ce4f37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,8 @@
         <module>modules/i3plus-pojo-workflow</module>
         <module>modules/i3plus-pojo-mes-pcn</module>
         <module>modules/i3plus-pojo-sweb</module>
+        <module>modules/i3plus-pojo-andon</module>
+        <module>modules/i3plus-pojo-lac</module>
     </modules>
 
     <dependencies>

From 7349c5fb3a4599d11a0bdf9c07478eca33dc31e1 Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Wed, 8 May 2019 20:38:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
index 6f92321..96fa22a 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
@@ -18,7 +18,7 @@ import java.text.DecimalFormat;
 import java.util.List;
 
 /**
- * @Description : 组织
+ * @Description : 组织 1.0
  * @Reference   :
  * @Author      : wei.peng
  * @Date        : 2018-10-22 16:58:42.923