From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001 From: chenhaozhe <cgz@hz-kingdee.com> Date: 星期五, 30 五月 2025 21:00:08 +0800 Subject: [PATCH] 合并冲突 --- WebAPI/ListModels.cs | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 0707b17..ba58962 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -228,6 +228,30 @@ } /// <summary> + /// 瀹㈡埛鏍囩鍙嶅簭鍒楀寲 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_CustomerTagInfoMain> getCustomerTagInfoMainByJson(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_CustomerTagInfoMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_CustomerTagInfoMain>>(jsonString); + return list; + } + + /// <summary> + /// 瀹㈡埛鏍囩鍙嶅簭鍒楀寲瀛愯〃 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsSc_CustomerTagInfoSub> getCustomerTagInfoSubByJson(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsSc_CustomerTagInfoSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_CustomerTagInfoSub>>(jsonString); + return list; + } + + /// <summary> /// 閫�璐ч�氱煡鍗曞弽搴忓垪鍖� /// </summary> /// <param name="jsonString"></param> -- Gitblit v1.9.1