Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-18 09897d2adec822b398c652bc3b8e6b6cfd6a6b2b

 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">