Merge branch 'api_score_meger' into alpha

Helius

2022-02-14 c34b0342177c90564ee5c9d3ef25c7442aaf71ba

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

@@ -113,4 +113,11 @@
    int findApiServiceOrderListTotal(ServiceOrderListDto serviceOrderListDto);

    public boolean skipServiceOrderStep(String step);

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