MES-WEB-API.git

			@@ -2,11 +2,8 @@
			<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<<<<<<< HEAD
			<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
			=======
			<NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile>
			>>>>>>> 861aefcec45c1843ad20d22a017054d33f78f8b9
			<NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />
			<IISExpressSSLPort />
			@@ -22,6 +19,7 @@
			<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
			<WebStackScaffolding_LayoutPageFile />
			<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
			<ProjectView>ProjectFiles</ProjectView>
			</PropertyGroup>
			<ProjectExtensions>
			<VisualStudio>