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

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

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

@@ -72,6 +72,13 @@
     */
    public int modifyCancelProjServices(SysProjServices projServices);

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


    /**
     * 划扣
@@ -104,4 +111,6 @@
    List<ServiceOrderListVo> findApiServiceOrderListInPage(ServiceOrderListDto serviceOrderListDto, PaginationVO pageVo);

    int findApiServiceOrderListTotal(ServiceOrderListDto serviceOrderListDto);

    public boolean skipServiceOrderStep(String step);
}