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
parent e897e7f0dc 7e0fd75f21
commit 11181cc106
3 changed files with 2 additions and 1 deletions
--- a/.vs/Pilot.Report/v16/.suo
+++ b/.vs/Pilot.Report/v16/.suo
--- a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs
+++ b/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs
@@ -593,6 +593,7 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
            FROM(SELECT *,1 Sort FROM #TempTable3
            UNION ALL
            SELECT 
+            null,
            t1.Area,
            t1.Area+'小计：',
            '',
--- a/Pilot.Report.Exploitation/bin/Debug/Newtonsoft.Json.dll
+++ b/Pilot.Report.Exploitation/bin/Debug/Newtonsoft.Json.dll