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

chenlu

2024-03-29 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java

@@ -13,5 +13,5 @@
@Mapper
public interface ReportMapper {

    List<Map<String, String>> processCardProgressMp(String orderId, FlowCard flowCard);
    List<Map<String, String>> processCardProgressMp(String orderId);
}