33 Commits

Author SHA1 Message Date
3cc2ce66cc 111 2025-03-20 15:33:44 +08:00
cae24e9319 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm 2025-03-20 15:22:18 +08:00
5643bc8d37 1 2025-03-20 15:20:39 +08:00
李狗蛋
f9a323850e q 2025-03-20 15:18:51 +08:00
572c386013 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm 2025-03-20 15:17:52 +08:00
a1c41292c6 1 2025-03-20 15:17:43 +08:00
李狗蛋
4fc8582fd7 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm 2025-03-20 12:00:26 +08:00
李狗蛋
d320cfebcd 5 2025-03-20 12:00:20 +08:00
df591445e9 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm 2025-03-20 11:58:11 +08:00
3ad0f2055c 1 2025-03-20 11:58:03 +08:00
李狗蛋
a9614feb10 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm
# Conflicts:
#	.vs/Pilot.Report/v17/DocumentLayout.backup.json
2025-03-20 11:56:35 +08:00
李狗蛋
06199678b5 1 2025-03-20 11:55:59 +08:00
bcd14e1b03 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm 2025-03-20 09:41:12 +08:00
428f91e0af 修复一些问题 2025-03-20 09:41:04 +08:00
李狗蛋
d3b0aea916 11 2025-03-19 18:36:07 +08:00
11181cc106 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm
# Conflicts:
#	Pilot.Report.Exploitation/SaleOrderProgress/PHBSaleOrderReport.cs
2025-03-17 19:04:52 +08:00
e897e7f0dc 11 2025-03-17 19:04:06 +08:00
李狗蛋
7e0fd75f21 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm
# Conflicts:
#	.vs/Pilot.Report/v17/.suo
#	.vs/Pilot.Report/v17/DocumentLayout.backup.json
#	.vs/Pilot.Report/v17/DocumentLayout.json
#	Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.dll
#	Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.pdb
2025-03-17 19:02:43 +08:00
李狗蛋
fe1d65a5e4 1 2025-03-17 19:01:23 +08:00
7208608d60 1 2025-03-17 09:39:43 +08:00
334613bf1e 11 2025-03-16 16:56:15 +08:00
de7d316849 过滤窗口查询修改 2025-03-16 16:41:25 +08:00
025aeb299e 1 2025-03-16 15:07:32 +08:00
40d0b96454 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm
# Conflicts:
#	Pilot.Report.Exploitation/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
1
2025-03-14 20:19:50 +08:00
李狗蛋
58d7a96f65 Revert "11"
This reverts commit 99f9c1f80a332b10474965e0d2d4264166326490.
2025-03-14 20:17:51 +08:00
d168557efe 11 2025-03-14 20:17:49 +08:00
5522afdbb1 11 2025-03-14 20:15:13 +08:00
李狗蛋
6e931376e8 1 2025-03-14 20:10:03 +08:00
99f9c1f80a 11 2025-03-14 20:02:04 +08:00
35b4d60fd6 1 2025-03-14 19:50:18 +08:00
李狗蛋
99635c4969 1 2025-03-14 19:35:54 +08:00
李狗蛋
1d2297cc10 1 2025-03-14 10:30:30 +08:00
李狗蛋
69cf26105d 0 2025-03-14 10:00:24 +08:00