TianHua/Piolot_RepotForm_PeiHao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm

Browse Source 
# Conflicts:
#	Pilot.Report.Exploitation/SaleOrderProgress/PHBSaleOrderReport.cs
This commit is contained in:
余宇波 2025-03-17 19:04:52 +08:00
commit 11181cc106
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Pilot.Report/v16/.suo
View File

Binary file not shown.

3
Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs
View File

@ -592,7 +592,8 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
INTO {0} INTO {0}
FROM(SELECT *,1 Sort FROM #TempTable3 FROM(SELECT *,1 Sort FROM #TempTable3
UNION ALL UNION ALL
SELECT SELECT
null,
t1.Area, t1.Area,
t1.Area+'小计：', t1.Area+'小计：',
'', '',

BIN
Pilot.Report.Exploitation/bin/Debug/Newtonsoft.Json.dll
View File

Binary file not shown.