Merge branch 'developer' into alpha

Helius

2022-03-09 2c481ac06298b5c464fd927893ce4c62b03c39c0

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

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

    int findApiServiceOrderListTotal(ServiceOrderListDto serviceOrderListDto);

    public boolean skipServiceOrderStep(String step);

    /**
     * 确认服务单
     * @param id
     * @return
     */
    int confirmServiceOrder(Long id);
}