fix 合并

zhongzheng-api/src/main/java/com/zhongzheng/controller/base/LockController.java

@@ -64,11 +64,8 @@ public class LockController extends BaseController {
     public AjaxResult<Void> lockStatus(@RequestBody ActionLockQueryBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         String key = "LockAppAction_"+bo.getAction()+"-"+loginUser.getUser().getUserId();
-        String username = redisCache.getCacheObject(key);
-        if(SecurityUtils.getUsername().equals(username)){
-            username = null;//同个用户不返回
-        }
-        return AjaxResult.success(username);
+        String action = redisCache.getCacheObject(key);
+        return AjaxResult.success(action);
     }
 
     /**