From f28d34bfcec8003187dcab5e5b4475761a6c00a2 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 23 十月 2025 14:43:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesService
---
WebApi/Gs.Sys/Services/FmController.cs | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index 8e5b3a8..3388663 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -1,15 +1,16 @@
-锘縰sing System.Collections;
-using System.Data;
-using System.Data.SqlClient;
-using System.Dynamic;
-using Gs.Toolbox;
+锘縰sing Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
using Gs.Toolbox.ApiCore.Common.Mvc;
using Gs.Toolbox.ApiCore.Group;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using NetTaste;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System.Collections;
+using System.Data;
+using System.Data.SqlClient;
+using System.Dynamic;
using static Gs.Toolbox.UtilityHelper;
namespace Gs.Sys.Services
@@ -324,14 +325,16 @@
((IDictionary<string, object>)_datajson)[keyChild] = _lst;
}
}
- var _obj = new
- {
- mesid = _mesGuid,
- taskname = keyTaskName,
- optype = keyMeth,
- datajson = JsonConvert.SerializeObject(_datajson),
- };
- return JsonConvert.SerializeObject(_obj);
+ /*var _obj = new
+ {
+ mesid = _mesGuid,
+ taskname = keyTaskName,
+ optype = keyMeth,
+ datajson = JsonConvert.SerializeObject(_datajson),
+ };
+ return JsonConvert.SerializeObject(_obj);*/
+
+ return JsonConvert.SerializeObject(_datajson);
}
//杩欐槸璁㈠崟鍥炰紶鏍囪瘑
List<dynamic> _datajson22 = new List<dynamic>();
--
Gitblit v1.9.3