将一期项目中相关代码合并到二期项目中去

pom.xml

@@ -36,6 +36,7 @@
         <spring-security.version>5.7.14</spring-security.version>
         <spring-framework.version>5.3.39</spring-framework.version>
         <mybatis.plus>3.5.1</mybatis.plus>
+        <guava.version>20.0</guava.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -235,8 +236,8 @@
         <module>smartFishingPort-system</module>
         <module>smartFishingPort-common</module>
         <module>smartFishingPort-base</module>
-        <module>smartFishingPort-kechuang</module>
         <module>smartFishingPort-solr</module>
+        <module>smartFishingPort-kechuang</module>
     </modules>
     <packaging>pom</packaging>