Merge branch 'master' of E:\mn\pqs with conflicts.

pqs-event/event-boot/pom.xml

@@ -77,11 +77,11 @@
     <build>
         <finalName>eventboot</finalName>
 
-      <!--  <resources>
+         <resources>
             <resource>
                 <directory>src/main/java</directory>
                 <includes>
-                    <include>**/*.*</include>
+                    <include>**/*.ftl</include>
                 </includes>
                 <filtering>false</filtering>
             </resource>
@@ -92,9 +92,9 @@
                     <include>**/*.properties</include>
                     <include>**/*.yml</include>
                 </includes>
-                <filtering>false</filtering>
+                <filtering>true</filtering>
             </resource>
-        </resources>-->
+        </resources>
 
         <plugins>
             <plugin>