productDev/parkBike.git

			@@ -221,6 +221,7 @@
			queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
			queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
			queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
			queryWrapper.eq(MemberRides::getBackType, Constants.ZERO);
			queryWrapper.in(MemberRides::getStatus,
			Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
			queryWrapper
			@@ -336,7 +337,7 @@
			}
			QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
			wrapper.lambda()
			.eq(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK));
			.in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK));
			List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
			Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s));

			@@ -605,6 +606,7 @@
			bikes.setId(Constants.getUUID());
			bikes.setIsdeleted(Constants.ZERO);
			bikes.setCreateDate(new Date());
			bikes.setEditDate(bikes.getCreateDate());
			bikes.setSiteId(model.getSiteId());
			bikes.setLockId(model.getCode());
			bikes.setCode(model.getBikeCode());
			@@ -653,6 +655,7 @@
			sites.setCode(locks.getSiteId());
			sites.setId(locks.getSiteId());
			sites.setCreateDate(date);
			sites.setEditDate(date);
			sites.setStatus(Constants.ZERO);
			sites.setEditDate(date);
			sites.setLockNum(1);