Merge branch 'developer'

姜友瑶

2022-08-09 c423224dbe37ea69c1a36c696f85490343e68c4c

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

@@ -62,6 +62,8 @@
     */
    public SysProjServices findById(Long id);

    public List<SysProjServices> findByIds(List<Long> id);

    /**
     * 排班
     */
@@ -113,4 +115,11 @@
    int findApiServiceOrderListTotal(ServiceOrderListDto serviceOrderListDto);

    public boolean skipServiceOrderStep(String step);

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