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

1
2025-02-24 14:56:54 +08:00 · 2025-02-24 14:56:51 +08:00
5 changed files with 2 additions and 2 deletions
--- a/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls
+++ b/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls
--- a/SGGL/FineUIPro.Web/File/Excel/DataIn/PunchlistFrom导入模板.xls
+++ b/SGGL/FineUIPro.Web/File/Excel/DataIn/PunchlistFrom导入模板.xls
--- a/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls
+++ b/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@ -19406,7 +19406,7 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.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">
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
Author	SHA1	Message	Date
夏菊	062d7bf0fd	Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN	2025-02-24 14:56:54 +08:00
夏菊	35f98fdcad	1	2025-02-24 14:56:51 +08:00