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

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -106,9 +106,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         List<AdamEntersVo> entersVoList = new ArrayList<>();
         String uid = CurrentUtil.getCurrentUid();
         String lock = "userId:" + uid;
-        if (!redisLockUtil.tryLock(lock, 1, 5)) {
-            return ResponseDto.failure(ErrorMapping.get("20023"));//参数错误
-        }
+//        if (!redisLockUtil.tryLock(lock, 1, 5)) {
+//            return ResponseDto.failure(ErrorMapping.get("20023"));//参数错误
+//        }
         try {
             currentTime = System.currentTimeMillis();
             KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(payOrderParam.getPerformanceId());