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

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs

@@ -358,7 +358,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 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)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -19216,7 +19216,7 @@
       </FlavorProperties>
     </VisualStudio>
   </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. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">