Merge branch 'wheng' of wuheng/eas-system into master

controller/pom.xml

@@ -81,8 +81,8 @@
     </dependencyManagement>
 
     <build>
-        <resources>
-            <resource>
+<!--        <resources>-->
+<!--            <resource>-->
 <!--                <directory>src/main/resources</directory>-->
 <!--                <filtering>true</filtering>-->
 <!--                <includes>-->
@@ -94,8 +94,8 @@
 <!--                    <include>**/*.yaml</include>-->
 <!--                    <include>**/*.properties</include>-->
 <!--                </includes>-->
-            </resource>
-        </resources>
+<!--            </resource>-->
+<!--        </resources>-->
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>