1

2025-07-07 10:05:32 +08:00
parent 38fe912549
commit de396ca60b
24 changed files with 197 additions and 86 deletions
--- a/GZ_LTHPilot_ORDER.csproj
+++ b/GZ_LTHPilot_ORDER.csproj
@@ -238,11 +238,10 @@
    <Compile Include="PRD_PPBOMCHANGE\PLTHForm.cs" />
    <Compile Include="PRD_PPBOMCHANGE\PLTHWL.cs" />
    <Compile Include="SAL_DELIVERYNOTICE\PushCeLue.cs" />
-<<<<<<< HEAD
+
    <Compile Include="SAL_ORDERList\ListUpFJ.cs" />
    <Compile Include="SAL_ORDER\DataChage.cs" />
-=======
->>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2
+
    <Compile Include="SAL_ORDER\SaveWL.cs" />
    <Compile Include="T_PUR_RECEIVE\SaveDate.cs" />
    <Compile Include="SAL_DELIVERYNOTICE\SaveYFH.cs" />