Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-05-16 8c7508388bad1234b731e0fc59afa095db0fda1b

 zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java

@@ -111,4 +111,6 @@
    List<ServiceOrderListVo> findApiServiceOrderListInPage(ServiceOrderListDto serviceOrderListDto, PaginationVO pageVo);

    int findApiServiceOrderListTotal(ServiceOrderListDto serviceOrderListDto);

    public boolean skipServiceOrderStep(String step);
}