Merge branch 'master' into energy-manage-shiyue

energy-manage-service/pom.xml

@@ -13,7 +13,6 @@
 
     <properties>
         <energy-manage-common.version>1.0.0-SNAPSHOT</energy-manage-common.version>
-        <energy-manage-element.version>1.0.0-SNAPSHOT</energy-manage-element.version>
     </properties>
 
     <dependencies>
@@ -23,12 +22,6 @@
             <version>${energy-manage-common.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.zhzn.energy</groupId>
-            <artifactId>energy-manage-element</artifactId>
-            <version>${energy-manage-element.version}</version>
-        </dependency>
-
         <!-- xxl-job 分布式任务 （暂时不用） -->
 <!--        <dependency>-->
 <!--            <groupId>com.xuxueli</groupId>-->