From 5584ec7ce51f5f0e15a0864aaef0d5b1c963f2e7 Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Fri, 26 Oct 2018 17:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20=20=20?=
 =?UTF-8?q?=20=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=A1=A8=E8=BE=BE?=
 =?UTF-8?q?=E5=BC=8F=20=20=20=20=20=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90=20?=
 =?UTF-8?q?=20=20=20=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

权限
    用户管理           功能完成
    用户登录           功能完成
---
 .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java   |  1 -
 .../cn/estsh/i3plus/pojo/mes/MachineFactory.java   |  1 +
 pom.xml                                            | 46 +++++++++++-----------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
index 7c9ad43..29d85ba 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
@@ -11,7 +11,6 @@ import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description :
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java
index 884e6d9..efc83a4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes;
 
+
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
diff --git a/pom.xml b/pom.xml
index 6cc1e7e..6ba6a0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,11 +18,11 @@
     <version>1.0-SNAPSHOT</version>
 
     <modules>
-        <module>modules/i3plus-pojo-mes</module>
-        <module>modules/i3plus-pojo-wms</module>
+        <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>
         <module>modules/i3plus-pojo-model</module>
-        <module>modules/i3plus-pojo-base</module>
+        <module>modules/i3plus-pojo-mes</module>
+        <module>modules/i3plus-pojo-wms</module>
     </modules>
 
     <dependencies>
@@ -137,26 +137,26 @@
         </snapshotRepository>
     </distributionManagement>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-
-            <!--  添加编译插件 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <!--<build>-->
+        <!--<plugins>-->
+            <!--<plugin>-->
+                <!--<groupId>org.springframework.boot</groupId>-->
+                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
+            <!--</plugin>-->
+
+            <!--&lt;!&ndash;  添加编译插件 &ndash;&gt;-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-compiler-plugin</artifactId>-->
+                <!--<version>3.5.1</version>-->
+                <!--<configuration>-->
+                    <!--<source>1.8</source>-->
+                    <!--<target>1.8</target>-->
+                    <!--<encoding>UTF-8</encoding>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
+        <!--</plugins>-->
+    <!--</build>-->
 
 
 </project>
\ No newline at end of file