shecs
/
ZHJA_HJGL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

This commit is contained in:
佘春生 2024-11-28 10:25:29 +08:00
parent 089ab7603b
commit 85668372fa
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />

2
HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs
View File

@ -37,7 +37,7 @@ namespace FineUIPro.Web.WeldMat.Stock
this.drpMaterialman.DataValueField = "UserId"; this.drpMaterialman.DataValueField = "UserId";
this.drpMaterialman.DataTextField = "UserName"; this.drpMaterialman.DataTextField = "UserName";
this.drpMaterialman.DataSource = BLL.Sys_UserService.GetUserList(); this.drpMaterialman.DataSource = BLL.Project_UserService.Sys_UserService.GetUserList();
this.drpMaterialman.DataBind(); this.drpMaterialman.DataBind();
if (CurrUser.Account != Const.Gly) if (CurrUser.Account != Const.Gly)

3
HJGL_ZH/WebAPI/Areas/HelpPage/SampleGeneration/HelpPageSampleGenerator.cs
View File

@ -10,6 +10,7 @@ using System.Net.Http;
using System.Net.Http.Formatting; using System.Net.Http.Formatting;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Web.Http.Description; using System.Web.Http.Description;
using System.Xml;
using System.Xml.Linq; using System.Xml.Linq;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -378,7 +379,7 @@ namespace WebAPI.Areas.HelpPage
try try
{ {
object parsedJson = JsonConvert.DeserializeObject(str); object parsedJson = JsonConvert.DeserializeObject(str);
return JsonConvert.SerializeObject(parsedJson, Formatting.Indented); return JsonConvert.SerializeObject(parsedJson, Newtonsoft.Json.Formatting.Indented);
} }
catch catch
{ {

1
HJGL_ZH/WebAPI/WebAPI.csproj
View File

@ -108,6 +108,7 @@
<Private>True</Private> <Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath> <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="WebGrease"> <Reference Include="WebGrease">
<Private>True</Private> <Private>True</Private>
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath> <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>