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

guoyuji

2024-06-25 8668e5ce64e1d7b3dbfffc42cf6767cb9ea2d6c0

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -637,8 +637,8 @@
                                                    od.order_number = fc.order_number
        where fc.process_id = #{processId}
        and fc.technology_number=#{technologyNumber}
       group by od.order_number,width,height

        group by od.order_number,width,height
        order by IF(fc.sort!=NULL||fc.sort!='',fc.sort,fc.order_number)
    </select>

    <select id="getPrintLabelCount">