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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

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

@@ -74,6 +74,8 @@

    /**
     * 删除服务单中明细， 即项目/套餐
     * @param id
     * @return
     */
    public int deleteProjServiceItemById(Long id);

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

    int findApiServiceOrderListTotal(ServiceOrderListDto serviceOrderListDto);

    public boolean skipServiceOrderStep(String step);
}