From 09897d2adec822b398c652bc3b8e6b6cfd6a6b2b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 18 七月 2024 10:57:22 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 9612a60..363475e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -779,7 +779,7 @@
pl.technology_number = fc.technology_number
where pl.create_time between #{selectTime1} and #{selectTime2}
GROUP BY fc.process_id, ogd.technology_number
- order by fc.process_id, ogd.technology_number
+ order by pl.id,fc.process_id, ogd.technology_number
</select>
<select id="getRepairPrintCustomData">
@@ -933,7 +933,7 @@
pl.technology_number = fc.technology_number
where pl.create_time between #{selectTime1} and #{selectTime2}
GROUP BY fc.process_id, ogd.technology_number
- order by fc.process_id, ogd.technology_number
+ order by pl.id,fc.process_id, ogd.technology_number
</select>
<select id="getDetailListLike">
--
Gitblit v1.8.0