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

xj qian

2024-09-05 86996f38d6dc5bb6a049f3ab6aa492bd22f7dde0

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

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -550,6 +550,7 @@
    <ClCompile Include="..\project\business\Expense\CommissionExpenseItem.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\CommodityInspectionExpense.cpp" />
    <ClCompile Include="..\project\business\Expense\Drawback.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
@@ -575,6 +576,9 @@
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\FreightExpenseList.cpp" />
    <ClCompile Include="..\project\business\Expense\GdnSourceSplit.cpp" />
    <ClCompile Include="..\project\business\Expense\InsuranceExpense.cpp" />
    <ClCompile Include="..\project\business\Expense\InsuranceExpenseBase.cpp" />
    <ClCompile Include="..\project\business\Expense\InsuranceExpenseEx.cpp" />
    <ClCompile Include="..\project\business\Expense\list.expense.ap.cpp" />
    <ClCompile Include="..\project\business\Expense\list.manage.ap.cpp" />
    <ClCompile Include="..\project\business\Expense\maint.basicfare.cpp">
@@ -583,6 +587,7 @@
    <ClCompile Include="..\project\business\Expense\maint.Document.ExportCredit.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\maint.Document.MouldFeeBase.cpp" />
    <ClCompile Include="..\project\business\Expense\maint.Document.SampleRequestForm.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
@@ -599,6 +604,8 @@
    <ClCompile Include="..\project\business\Expense\MouldFee.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\MouldFeeBase.cpp" />
    <ClCompile Include="..\project\business\Expense\MouldFeeEx.cpp" />
    <ClCompile Include="..\project\business\Expense\PaperCardCheck.cpp" />
    <ClCompile Include="..\project\business\Expense\PaperCardReconciliation.cpp" />
    <ClCompile Include="..\project\business\Expense\PaperCardReconciliationEx.cpp">

 jrj/project/business/Expense/CommodityInspectionExpense.cpp

Binary files differ

 jrj/project/business/Expense/InsuranceExpense.cpp

Binary files differ

 jrj/project/business/Expense/InsuranceExpenseBase.cpp

Binary files differ

 jrj/project/business/Expense/InsuranceExpenseEx.cpp

Binary files differ

 jrj/project/business/Expense/MouldFeeBase.cpp

Binary files differ

 jrj/project/business/Expense/MouldFeeEx.cpp

Binary files differ

 jrj/project/business/Expense/maint.Document.MouldFeeBase.cpp

Binary files differ

 jrj/project/business/ProductSample/ProductLibraryItemMaint3.cpp

Binary files differ

 jrj/project/business/SystemSettings/BindComputer.cpp

@@ -25,7 +25,6 @@
    {
        xml x;


        xaserverarg arg;
        
        arg = GetArg();

 jrj/project/business/SystemSettings/UserImport.cpp

@@ -168,7 +168,7 @@
        xml x;

        xaserverarg arg;
        arg.setNativePointer(arg.CreateInstance());

        arg.AddArg(L"sguid", id);
        if (xurl::post(L"/sale/data/OrganizationStruct/tree.child.OrgChart", arg.GetString(), x) != 1)
        {