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

guoyuji

2024-12-10 7b0d59dbd16a0f90eec1ad35eff64cf40d3b97e7

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

@@ -88,4 +88,7 @@
    Map<String,Integer> getSelectStorageRecordPintPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                            @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

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

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