Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java

src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java

@@ -136,12 +136,12 @@ public class ConfigSynchronizationService  extends BaseService{
 					handleCallbackData(className,page,entity,request,response,false);
 				}
 				if(!isFinished && lastServiceTag){//如果业务没有配置数据，并且为最后一个业务，需要发送给服务接口一个结束标识
-					String json = "";
-					if("1".equals(serviceType)){
+					String json = "{}";
+					/*if("1".equals(serviceType)){
 						json="{}";
 					}else{
 						json="[]";
-					}
+					}*/
 					JSONObject result = ConfigServiceUtil.configSync(json,Integer.parseInt(serviceType),entity.getServiceId(),entity.getTableName(),"FINISHED");
 				}
 			}