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

guoyuji

2024-10-23 77c7984fb636f81a87208aea2bcffc701f6419e8

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

@@ -29,4 +29,6 @@
    List<Map<String,String>> filterOrderProcessCollect(Date selectTime1, Date selectTime2);

    List<Map<String, Integer>> getGlassLRowCollect(Date selectTime1, Date selectTime2);

    String selectNextProcess(String processId, String technologyNumber, String thisProcess);
}