Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-08-08 a158ed9136af588b82d365f98074b29c70cdb601

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java

@@ -20,7 +20,7 @@

    List<Map<String,String>> filterOrderProcess(String orderId);

    List<Map<String,Integer>> getGlassLRow(String orderId);
    List<Map<String,Object>> getGlassLRow(String orderId);

    List<Map<String, String>> filterLastProcess(String orderId, String orderNumber, String technologyNumber,String id);