55 Commits

Author SHA1 Message Date
c7ef926f9f 11 2025-06-05 19:33:30 +08:00
6556733ec4 11 2025-04-16 10:40:39 +08:00
a7b8b2a6b1 122 2025-04-14 20:00:43 +08:00
3427feaa30 2222 2025-04-13 18:20:18 +08:00
d961feee4e 111 2025-04-02 10:17:45 +08:00
81052b4bc3 11 2025-03-31 19:00:00 +08:00
cc19a5c855 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm 2025-03-31 16:37:52 +08:00
2512ae275a 年度回款额报表 2025-03-31 16:37:37 +08:00
李狗蛋
f0c16b10b3 1 2025-03-31 16:28:34 +08:00
a7a1d834b0 11 2025-03-28 19:33:04 +08:00
2a7a73b657 修改视图 2025-03-25 15:06:34 +08:00
李狗蛋
6161452816 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm 2025-03-23 22:37:01 +08:00
李狗蛋
df4949cc7c 1 2025-03-23 22:36:16 +08:00
李狗蛋
064bd4be1b 1 2025-03-23 20:10:52 +08:00
4584034fb5 1 2025-03-21 19:44:37 +08:00
李狗蛋
0cf24f34c1 Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm 2025-03-21 19:35:18 +08:00
李狗蛋
3cceb04a55 1 2025-03-21 19:35:04 +08:00
c48b797823 1 2025-03-21 19:32:34 +08:00
8e6ae37c39 增加字段,调整金蝶DLL的位置 2025-03-21 09:53:55 +08:00
1d09121892 22 2025-03-20 15:36:16 +08:00
e5ddab3bad Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm 2025-03-20 15:34:46 +08:00
3cc2ce66cc 111 2025-03-20 15:33:44 +08:00
李狗蛋
67090d52dc Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm
# Conflicts:
#	Pilot.Report.Exploitation/Pilot.Report.Exploitation.csproj.user
2025-03-20 15:31:06 +08:00
李狗蛋
b35f098b17 1 2025-03-20 15:25:11 +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
李狗蛋
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