From 85668372fa20356cbce846fd444217982ae935ef Mon Sep 17 00:00:00 2001
From: shecs <408299694@qq.com>
Date: Thu, 28 Nov 2024 10:25:29 +0800
Subject: [PATCH] 11

---
 HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user                | 2 +-
 HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs        | 2 +-
 .../Areas/HelpPage/SampleGeneration/HelpPageSampleGenerator.cs | 3 ++-
 HJGL_ZH/WebAPI/WebAPI.csproj                                   | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
index b29320e..116414c 100644
--- a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs b/HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs
index 64bd7a4..e01087a 100644
--- a/HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.WeldMat.Stock
 
                 this.drpMaterialman.DataValueField = "UserId";
                 this.drpMaterialman.DataTextField = "UserName";
-                this.drpMaterialman.DataSource = BLL.Sys_UserService.GetUserList();
+                this.drpMaterialman.DataSource = BLL.Project_UserService.Sys_UserService.GetUserList();
                 this.drpMaterialman.DataBind();
 
                 if (CurrUser.Account != Const.Gly)
diff --git a/HJGL_ZH/WebAPI/Areas/HelpPage/SampleGeneration/HelpPageSampleGenerator.cs b/HJGL_ZH/WebAPI/Areas/HelpPage/SampleGeneration/HelpPageSampleGenerator.cs
index 136deb8..57d8e32 100644
--- a/HJGL_ZH/WebAPI/Areas/HelpPage/SampleGeneration/HelpPageSampleGenerator.cs
+++ b/HJGL_ZH/WebAPI/Areas/HelpPage/SampleGeneration/HelpPageSampleGenerator.cs
@@ -10,6 +10,7 @@ using System.Net.Http;
 using System.Net.Http.Formatting;
 using System.Net.Http.Headers;
 using System.Web.Http.Description;
+using System.Xml;
 using System.Xml.Linq;
 using Newtonsoft.Json;
 
@@ -378,7 +379,7 @@ namespace WebAPI.Areas.HelpPage
             try
             {
                 object parsedJson = JsonConvert.DeserializeObject(str);
-                return JsonConvert.SerializeObject(parsedJson, Formatting.Indented);
+                return JsonConvert.SerializeObject(parsedJson, Newtonsoft.Json.Formatting.Indented);
             }
             catch
             {
diff --git a/HJGL_ZH/WebAPI/WebAPI.csproj b/HJGL_ZH/WebAPI/WebAPI.csproj
index eda7661..ccfbeb8 100644
--- a/HJGL_ZH/WebAPI/WebAPI.csproj
+++ b/HJGL_ZH/WebAPI/WebAPI.csproj
@@ -108,6 +108,7 @@
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="WebGrease">
       <Private>True</Private>
       <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>