Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

chenlu

2024-04-25 fa21fb9f55010337521c127bd0c7c865c303451e

Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

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

@@ -21,7 +21,7 @@
        o.project,
        o.batch,
        od.product_name,
        ogd.technology_number,
        r.technology_number,
        ogd.glass_address,
        r.rework_num,
        od.width,

 north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml

@@ -21,7 +21,7 @@
        o.project,
        o.batch,
        od.product_name,
        ogd.technology_number,
        r.technology_number,
        ogd.glass_address,
        r.rework_num,
        od.width,