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

@@ -428,7 +428,6 @@ public class ConfigSynchronizationService  extends BaseService{
 			maatBean.setVersion(Constants.MAAT_VERSION);
 			maatBean.setOpAction(Constants.INSERT_ACTION);
 			String json=gsonToJson(maatBean);
-//			logger.info(json);
 			//调用服务接口下发配置数据
 			if(isUpdateCfg) {
 				logger.info("配置批量下发："+json);