Merge branch 'dev-zza' into dev

jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java

@@ -85,16 +85,19 @@ public class PersonPileController extends BaseController {
                 int i = pileService.pileMemberBinding(dto);
                 response = new RestApiResponse<>(i);
             }
-
         } catch (BusinessException e) {
             logger.error("绑定个人桩信息 error,", e);
             response = new RestApiResponse<>(e.getCode(), e.getMessage());
         } catch (Exception exception) {
             logger.error("绑定个人桩信息 error,", exception);
             response = new RestApiResponse<>(ReturnCodeEnum.CODE_BINDING_PERSONAL_PILE_ERROR);
+        }finally {
+            String cacheUid = redisCache.getCacheObject(lockKey);
+            if (StringUtils.equals(cacheUid, uuid)) {
+                // 解锁
+                redisCache.unLock(lockKey);
+            }
         }
-        // 解锁
-        redisCache.unLock(lockKey);
         logger.info("绑定个人桩信息  result:{}", response);
         return response;
     }