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

zhangc

7 天以前 84e12ecd3923f28b62b8659b138a554b0f6e084d

 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