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>E:\智云mes\mes\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile9.pubxml</NameOfLastUsedPublishProfile>
			=======
			<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
			>>>>>>> 7d2677241200a3a1fd110e5d37864571c6d87f67
			<NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile>
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />
			<IISExpressSSLPort />
			@@ -14,6 +11,14 @@
			<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
			<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
			<UseGlobalApplicationHostFile />
			<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
			<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
			<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
			<WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
			<WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
			<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
			<WebStackScaffolding_LayoutPageFile />
			<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
			</PropertyGroup>
			<ProjectExtensions>
			<VisualStudio>