合并分支

chenhaozhe

2025-06-26 ae4902061bc8e34f341d55b85f28acdf24d3b9dc

 BLL/BLL.csproj

@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>BLL</RootNamespace>
    <AssemblyName>BLL</AssemblyName>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -41,6 +41,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -49,6 +50,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
@@ -57,6 +59,7 @@
    <DebugType>full</DebugType>
    <PlatformTarget>x86</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    <OutputPath>bin\x86\Release\</OutputPath>
@@ -65,6 +68,7 @@
    <DebugType>pdbonly</DebugType>
    <PlatformTarget>x86</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AxInterop.gregn6Lib">
@@ -105,6 +109,12 @@
      <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>
@@ -431,6 +441,9 @@
      <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>
@@ -611,11 +624,21 @@
      <Project>{f7838319-779c-4ad9-a59f-5dcb5757f335}</Project>
      <Name>Pub_Control</Name>
    </ProjectReference>
    <ProjectReference Include="..\sdk_dingding\TopSdk\TopSdk.csproj">
      <Project>{9C11CAE5-5188-4E71-825B-68FC3135728A}</Project>
      <Name>TopSdk</Name>
    </ProjectReference>
    <ProjectReference Include="..\SQLHelper\SQLHelper.csproj">
      <Project>{0a4ef483-d8d3-49a5-8378-974ef7993365}</Project>
      <Name>SQLHelper</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="SBGL\SBBB\impl\" />
  </ItemGroup>
  <ItemGroup>
    <WCFMetadata Include="Connected Services\" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.