Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java

@@ -196,7 +196,7 @@ public class FactoryXxlJob {
 		// 调用接口写入到老系统的数据库
 		resoveFactoryData();
 		// 走新系统暂存单
-		resoveFactoryDataNew();
+//		resoveFactoryDataNew();
 		return ReturnT.SUCCESS;
 	}