MES-WEB-API.git

			@@ -1662,9 +1662,6 @@
			}
			#endregion

			<<<<<<< HEAD

			=======
			#region å·¡æ£æ£éªåæ ¹æ®æºåç±»åè·åä¿¡æ¯-æºåä¸ºçäº§è®¢å
			[Route("QC_PatrolProcCheckBill/get_ICMOBill")]
			[HttpGet]
			@@ -1717,7 +1714,5 @@
			}
			}
			#endregion
			>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf

			}
			}

			@@ -5,7 +5,7 @@
			<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			<LastActiveSolutionConfig>Debug\|x86</LastActiveSolutionConfig>
			<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>

	WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/WebAPI.csproj.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史