Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

22 小时以前 af5081bc0d0668d526a204076557a171097ddb8d

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java

@@ -188,7 +188,7 @@

    @Override
    public List<Integer> selectUsedBackpacks(Long travelId, Long agvId) {
        return this.baseMapper.selectUsedBackpacks(agvId, travelId);
        return this.baseMapper.selectUsedBackpacks(travelId, agvId);
    }

    @Override