Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2024-07-16 7a91c3a1ed37b0332d4ff0ebeae60bd6da3665c0

 jrj/ext-jrj/ext-jrj.vcxproj.filters

@@ -115,6 +115,9 @@
    <Filter Include="project\business\Company">
      <UniqueIdentifier>{84413ffb-b8a4-4dfe-a715-ef03dec8f2ef}</UniqueIdentifier>
    </Filter>
    <Filter Include="project\business\BasicCode">
      <UniqueIdentifier>{64c23153-69c8-4db3-9225-9e5375e489ff}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="framework.h">
@@ -839,9 +842,6 @@
    <ClCompile Include="..\project\total3\viewex.total2.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\CustomCodeNew.cpp">
      <Filter>project\business\GDN</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\po.paper.cpp">
      <Filter>project\business\GDN</Filter>
    </ClCompile>
@@ -908,5 +908,116 @@
    <ClCompile Include="..\project\total3\ViewTotalWin.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\CustomCodeNew.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\AccountUnitMaint.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\AddUomGroup.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\basicfareTypeList.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\brand.regtype.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\BrandInforList.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\BrandInforMaint.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\CartermList.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\ColorCardNew.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\CustomerMarketList.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\CustomerMarketMaint.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\ExchangeRate.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\ExpressList.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\ExpressMaint.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\FCL.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\ForwarderList.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\ForwarderMaint.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\FreightExpenseType.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\PaymentTerm.list.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\PaymentTerm.maint.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\ProfitParam.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\QuickCode.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\QuickCode_Tree.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\SetUpRemarks.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\ShipcompanyList.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\ShipcompanyMaint.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\Simple.Menu.Config.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\SKUItem.categoryselect.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\SKUItem.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\SKUItem.select.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\SKUTemplate.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\SKUTemplate.select.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\SourceRemark.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\SpecialDeductFeeList.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\TestingCompanyList.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\TestingCompanyMaint.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\BasicCode\TypeList.maint.supplier.cpp">
      <Filter>project\business\BasicCode</Filter>
    </ClCompile>
  </ItemGroup>
</Project>