fix 合并

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

@@ -61,11 +61,11 @@ public class LockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('grade:grade:edit')")
     @Log(title = "查看行为锁定状态", businessType = BusinessType.UPDATE)
     @PostMapping("/lockStatus")
-    public AjaxResult<Void> lockStatus(@RequestBody ActionLockQueryBo bo) {
+    public AjaxResult<String> lockStatus(@RequestBody ActionLockQueryBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         String key = "LockAppAction_"+bo.getAction()+"-"+loginUser.getUser().getUserId();
         String action = redisCache.getCacheObject(key);
-        return AjaxResult.success(action);
+        return AjaxResult.success("有其他端在操作",action);
     }
 
     /**