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

guoyujie

2025-07-18 6661232f32135d943c76197afba2baac81e171f4

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java

@@ -98,7 +98,7 @@

    List<Map<String, Object>> getDetailList(String orderId, String processId, String remarks);

    List<Map<String, Object>> getDetailLists(String orderId, String remarks, Integer productId);
    List<Map<String, Object>> getDetailLists(String orderId, String remarks, Integer productId,String thickness);

    List<Map<String, Object>> getDetailList2(String orderId, String processId, String remarks);
}