Merge branch 'score_shop' into api_score_meger

jyy

2021-07-27 e9c394d8944d6afc40dc36336e4e93f4de1517c2

 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);
}