Merge branch 'master' of http://demo.ibizlab.cn/j2ee/springmvc_r2

# Conflicts:
#	SLN/srv_${pub.codeName}/pom.xml.ftl

SLN/srv_${pub.codeName}/pom.xml.ftl

@@ -15,6 +15,10 @@ PUBOBJ=WebAppConfig
 	</parent>
         
         <dependencies>		
+<<<<<<< HEAD
+=======
+<#if pub.getPSApplication().getPFType()?index_of("JQUERY_V2")!=-1 || (pub.getPSApplication().getPFType()?index_of("Vue V2")!=-1)>
+>>>>>>> 0319da920701d3f8e809fa2e2f29c678ce77c12f
 			<dependency>
 			<groupId>${pub.getPKGCodeName()}</groupId>
 			<artifactId>app_${pub.getPSApplication().getPKGCodeName()}</artifactId>
@@ -41,7 +45,12 @@ PUBOBJ=WebAppConfig
 				<artifactId>maven-war-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
+<<<<<<< HEAD
 					<overlays>						
+=======
+					<overlays>
+<#if pub.getPSApplication().getPFType()?index_of("JQUERY_V2")!=-1 || (pub.getPSApplication().getPFType()?index_of("Vue V2")!=-1)>						
+>>>>>>> 0319da920701d3f8e809fa2e2f29c678ce77c12f
 						<!-- 其他的war项目 -->
 						<overlay>
 							<groupId>${pub.getPKGCodeName()}</groupId>