From 943c5905b7f4ff48c7ae87c41b41aeae854f8a20 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 11:02:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
index e1d9d2f..38c8675 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
@@ -93,7 +93,7 @@
     @ApiOperation(value = "������������")
     public  ResultMessage  authority(@RequestParam @ApiParam(value = "allocationNum",name = "������") String allocationNum,
                                      @RequestParam @ApiParam(value = "userId",name = "������Id") Integer userId){
-        boolean authority = allocationService.authority(allocationNum,userId);
+        Integer authority = allocationService.authority(allocationNum, userId);
         return ResultMessage.ok(authority);
     }
 

--
Gitblit v1.8.0