From c761ba5bd72e9170c65fad44003e90a61e034b33 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 03 十一月 2022 12:33:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BLL/BLL.csproj | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/BLL/BLL.csproj b/BLL/BLL.csproj
index 67e6e64..570128b 100644
--- a/BLL/BLL.csproj
+++ b/BLL/BLL.csproj
@@ -67,6 +67,9 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
<Reference Include="Interop.gregn6Lib">
<HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
@@ -98,6 +101,17 @@
</ItemGroup>
<ItemGroup>
<Compile Include="ClsBaseShow.cs" />
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="Xt_SystemParameterForOrg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Xt_SystemParameterForOrg.Designer.cs">
+ <DependentUpon>Xt_SystemParameterForOrg.cs</DependentUpon>
+ </Compile>
<Compile Include="绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByOrgRelation.cs">
<SubType>Form</SubType>
</Compile>
@@ -419,6 +433,13 @@
<SubType>Designer</SubType>
<DependentUpon>KB_KanbanPlaySet.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Xt_SystemParameterForOrg.resx">
+ <DependentUpon>Xt_SystemParameterForOrg.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="鍏敤妯″潡\AboutBox1.resx">
<SubType>Designer</SubType>
<DependentUpon>AboutBox1.cs</DependentUpon>
@@ -557,14 +578,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
--
Gitblit v1.9.1