Develop/Piolot_Order_TH
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://8.130.121.29:3000/TianHua/Piolot_Order_TH

Browse Source 
# Conflicts:
#	GZ_LTHPilot_ORDER.csproj
#	SAL_DELIVERYNOTICE/PushCeLue.cs
#	SAL_ORDER/SaveWL.cs
#	SQL/SqlManage.cs
#	bin/Debug/GZ_LTHPilot_ORDER.dll
#	bin/Debug/GZ_LTHPilot_ORDER.pdb
This commit is contained in:
李狗蛋
2025-07-04 18:01:07 +08:00
parent 95a74dc4f5 569ca39775
commit 38fe912549
5 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
GZ_LTHPilot_ORDER.csproj
View File

@@ -238,8 +238,11 @@
<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" />