From af78744eacb1e41ef2ba7a2e36cde3f915100ba2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 09 四月 2026 13:14:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/数据同步/小诸葛同步/XZG_DataSynchronizationController.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\345\260\217\350\257\270\350\221\233\345\220\214\346\255\245/XZG_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\345\260\217\350\257\270\350\221\233\345\220\214\346\255\245/XZG_DataSynchronizationController.cs"
index 2ddf598..245a062 100644
--- "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\345\260\217\350\257\270\350\221\233\345\220\214\346\255\245/XZG_DataSynchronizationController.cs"
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\345\260\217\350\257\270\350\221\233\345\220\214\346\255\245/XZG_DataSynchronizationController.cs"
@@ -738,7 +738,7 @@
{"Spec", DBUtility.ClsPub.isStrNull(material.sepc)},
{"weight", DBUtility.ClsPub.isStrNull(material.weight)},
{"headWeight", DBUtility.ClsPub.isStrNull(material.headWeight)},
- {"cycletime", DBUtility.ClsPub.isStrNull(material.cycleTime)},
+ //{"cycletime", DBUtility.ClsPub.isStrNull(material.cycleTime)},
{"fightsPartnum", DBUtility.ClsPub.isStrNull(material.flightsPartnum)},
{"comments", DBUtility.ClsPub.isStrNull(material.comments)},
{"colorName", DBUtility.ClsPub.isStrNull(material.colorName)},
--
Gitblit v1.9.1