From ae4902061bc8e34f341d55b85f28acdf24d3b9dc Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 六月 2025 14:41:51 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
index 48953e5..029323d 100644
--- "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
@@ -3609,14 +3609,14 @@
string msg = "";
try
{
- //if (getData_ErrWorkTimesRequest(startTime,endTime,ref msg) == false)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "Exception锛�" + msg;
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (getData_ErrWorkTimesRequest(startTime, endTime, ref msg) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + msg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1