lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
潘鸿锋 2024-08-01 16:02:33 +08:00
parent 3a2352f0e1 97f06b445b
commit 703e38f89d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
View File

@ -358,7 +358,7 @@ namespace FineUIPro.Web.Comprehensive
{ {
lists = lists.Where(x => x.NCRCode.Contains(this.txtNCRCode.Text.Trim())); lists = lists.Where(x => x.NCRCode.Contains(this.txtNCRCode.Text.Trim()));
} }
lists = lists.OrderBy(x => x.RemarkCode); lists = lists.OrderBy(x => x.IssuedDate);
if (lists != null) if (lists != null)
{ {
string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId); string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19216,7 +19216,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">