MES-WEB-API.git

			@@ -1,6 +1,10 @@
			<?xml version="1.0" encoding="utf-8"?>
			<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<<<<<<< HEAD
			<NameOfLastUsedPublishProfile>D:\vs\项目代码\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			=======
			<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
			<WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
			<WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
			@@ -9,7 +13,7 @@
			<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
			<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\GIT仓库\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />
			@@ -21,6 +25,7 @@
			<ProjectView>ProjectFiles</ProjectView>
			<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
			<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
			>>>>>>> a37a23572325c5acac8e8a8f32dd61a9f61faf01
			</PropertyGroup>
			<ProjectExtensions>
			<VisualStudio>