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

chenlu

2025-07-30 e9f8d23f55f64903d834308f9f167aaf3195c20d

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

@@ -94,7 +94,7 @@

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

    List<Map<String, String>> getPrimaryListLimts(String orderId, String processId, String remarks);
    List<Map<String, String>> getPrimaryListLimts(String customerName, String project, String remarks);

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