去掉前端技术判断，加入前端依赖

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

@@ -15,10 +15,6 @@ 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>
@@ -45,12 +41,8 @@ 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>
@@ -59,6 +51,7 @@ PUBOBJ=WebAppConfig
 								<exclude>**/web.xml</exclude>
 							</excludes>
 						</overlay>
+
 					</overlays>
 				</configuration>
 			</plugin>

template.properties

+SERVICEBASE=%1$s.srv.%2$s.service.%3$sServiceBase
+SERVICE=%1$s.srv.%2$s.service.%3$sService
+DAOBASE=%1$s.srv.%2$s.dao.%3$sDAOBase
+DAO=%1$s.srv.%2$s.dao.%3$sDAO
+ENTITYBASE=%1$s.srv.%2$s.entity.%3$sBase
+ENTITY=%1$s.srv.%2$s.entity.%3$s
+DEMODELBASE=%1$s.srv.%2$s.demodel.%3$sDEModelBase
+DEMODEL=%1$s.srv.%2$s.demodel.%3$sDEModel	
+CODELISTBASE=%1$s.srv.codelist.%3$sCodeListModelBase
+CODELIST=%1$s.srv.codelist.%3$sCodeListModel
+COUNTERBASE=%1$s.srv.counter.%3$sCounterHandlerBase
+COUNTER=%1$s.srv.counter.%3$sCounterHandler
+BADAO=%1$s.srv.%2$s.badao.%3$s%4$sDAO
+
+SUBSYS_SERVICE=%1$s.srv.%2$s.service.%3$sService
+SUBSYS_DEMODEL=%1$s.srv.%2$s.demodel.%3$sDEModel
+SUBSYS_CODELIST=%1$s.srv.%2$s.codelist.%3$sCodeListModel
\ No newline at end of file