MES-WEB-API.git

parent: a66f7508 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

5 天以前 00d786864e54c9478366b3d6ca36291e5ae678de

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

51个文件已修改

	NETERPNoWin/bin/x86/Debug/BLL.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/BLL.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/BaseSet.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/BaseSet.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/DAL.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/DAL.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/DBUtility.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/DBUtility.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/Kanban.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/Kanban.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/Model.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/Model.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/OAM.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/OAM.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/PlanM.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/PlanM.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/Pub_Class.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/Pub_Class.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/Pub_Control.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/Pub_Control.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/SQLHelper.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/SQLHelper.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/WarM.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/WarM.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/WorkM.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/bin/x86/Debug/WorkM.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/BLL.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/BLL.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/DAL.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/DAL.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/DBUtility.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/DBUtility.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/Interop.gregn6Lib.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/Model.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/Model.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/PayM.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/PayM.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/Pub_Class.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/Pub_Class.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/Pub_Control.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/Pub_Control.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/SQLHelper.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/x86/Debug/SQLHelper.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/WebAPI.csproj.user	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 NETERPNoWin/bin/x86/Debug/BLL.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/BLL.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/BaseSet.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/BaseSet.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/DAL.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/DAL.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/DBUtility.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/DBUtility.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Kanban.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Kanban.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Model.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Model.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe

Binary files differ

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/OAM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/OAM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/PlanM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/PlanM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Class.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Class.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Control.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Control.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/SQLHelper.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/SQLHelper.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/WarM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WarM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/WorkM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WorkM.pdb

Binary files differ

 PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll

Binary files differ

 PayM/bin/x86/Debug/BLL.dll

Binary files differ

 PayM/bin/x86/Debug/BLL.pdb

Binary files differ

 PayM/bin/x86/Debug/DAL.dll

Binary files differ

 PayM/bin/x86/Debug/DAL.pdb

Binary files differ

 PayM/bin/x86/Debug/DBUtility.dll

Binary files differ

 PayM/bin/x86/Debug/DBUtility.pdb

Binary files differ

 PayM/bin/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 PayM/bin/x86/Debug/Model.dll

Binary files differ

 PayM/bin/x86/Debug/Model.pdb

Binary files differ

 PayM/bin/x86/Debug/PayM.dll

Binary files differ

 PayM/bin/x86/Debug/PayM.pdb

Binary files differ

 PayM/bin/x86/Debug/Pub_Class.dll

Binary files differ

 PayM/bin/x86/Debug/Pub_Class.pdb

Binary files differ

 PayM/bin/x86/Debug/Pub_Control.dll

Binary files differ

 PayM/bin/x86/Debug/Pub_Control.pdb

Binary files differ

 PayM/bin/x86/Debug/SQLHelper.dll

Binary files differ

 PayM/bin/x86/Debug/SQLHelper.pdb

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -7,10 +7,4 @@
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
>>>>>>> c464f72ac383e8dbc98d8a43f05098fbaff64a19
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
>>>>>>> c464f72ac383e8dbc98d8a43f05098fbaff64a19
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache

 WebAPI/WebAPI.csproj.user

@@ -3,12 +3,11 @@
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.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>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt

@@ -4,3 +4,9 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb

			@@ -7,10 +7,4 @@
			C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
			C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
			C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
			C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
			>>>>>>> c464f72ac383e8dbc98d8a43f05098fbaff64a19
			C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
			C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
			C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
			C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
			>>>>>>> c464f72ac383e8dbc98d8a43f05098fbaff64a19
			C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache

			@@ -3,12 +3,11 @@
			<PropertyGroup>
			<LastActiveSolutionConfig>Debug\|x86</LastActiveSolutionConfig>
			<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.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>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />
			<IISExpressSSLPort />

			@@ -4,3 +4,9 @@
			D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
			D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
			D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
			D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
			D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
			D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
			D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
			D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
			D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb