Merge branch 'master' of http://47.104.102.122:3000/shecs/ZHJA_HJGL

.gitignore

@@ -101,3 +101,4 @@ HJGL_ZH/BLL/bin/Release/NPOI.OpenXmlFormats.dll
 /HJGL_ZH/Model/obj/Release/Model.dll
 /HJGL_ZH/Model/obj/Release/Model.pdb
 /HJGL_ZH/WebAPI/Web.config
+/ReleasePackerALL2017.bat

HJGL_ZH/WebAPI/WebAPI.csproj.user

@@ -10,29 +10,5 @@
     <UseGlobalApplicationHostFile />
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <StartPageUrl>
-          </StartPageUrl>
-          <StartAction>CurrentPage</StartAction>
-          <AspNetDebugging>True</AspNetDebugging>
-          <SilverlightDebugging>False</SilverlightDebugging>
-          <NativeDebugging>False</NativeDebugging>
-          <SQLDebugging>False</SQLDebugging>
-          <ExternalProgram>
-          </ExternalProgram>
-          <StartExternalURL>
-          </StartExternalURL>
-          <StartCmdLineArguments>
-          </StartCmdLineArguments>
-          <StartWorkingDirectory>
-          </StartWorkingDirectory>
-          <EnableENC>True</EnableENC>
-          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
+  <ProjectExtensions />
 </Project>