21690华鱼燕

This commit is contained in:
华鱼燕 2024-01-17 17:23:47 +08:00
parent f0a3063565
commit 4457514143
2 changed files with 18 additions and 0 deletions

View File

@ -114,6 +114,22 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="tc21690\clsENT21690.cs" /> <Compile Include="tc21690\clsENT21690.cs" />
<Compile Include="tcENT\clsENT.cs" /> <Compile Include="tcENT\clsENT.cs" />
<Compile Include="tcTEST21706\clsENT21706.cs" />
<Compile Include="tcTWEST21671\tcTEST_21671.cs" />
<Compile Include="tcTEST21703\clsTEST_21703.cs" />
<Compile Include="tcENT_21681\clsENT_21681.cs" />
<Compile Include="tcTest21681\clsTest21681.cs" />
<Compile Include="tcTEST14278\clsTest_14278.cs" />
<Compile Include="tcWIP\clsLot.cs" /> <Compile Include="tcWIP\clsLot.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,9 +2,11 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<<<<<<< HEAD <<<<<<< HEAD
<ReferencePath>E:\code\SRC\MES_S_DLL\</ReferencePath>
<ReferencePath>E:\code\SRC\MES_S_DLL\;E:\Project\digihua\iMES\SYS20240115\SRC\MES_S_DLL\;E:\Project\digihua\iMES\SYS20240115\SRC\MEStc_SXS\</ReferencePath> <ReferencePath>E:\code\SRC\MES_S_DLL\;E:\Project\digihua\iMES\SYS20240115\SRC\MES_S_DLL\;E:\Project\digihua\iMES\SYS20240115\SRC\MEStc_SXS\</ReferencePath>
======= =======
<ReferencePath>E:\VisualStudio_app\Digihua\iMES\MES_S_DLL\</ReferencePath> <ReferencePath>E:\VisualStudio_app\Digihua\iMES\MES_S_DLL\</ReferencePath>
>>>>>>> 42de248d2d2ff29266f47df9261e045a7a3351b6 >>>>>>> 42de248d2d2ff29266f47df9261e045a7a3351b6
</PropertyGroup> </PropertyGroup>
</Project> </Project>