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

zc-business/src/main/java/com/zc/business/controller/DcOrganizationController.java

@@ -70,7 +70,7 @@ public class DcOrganizationController extends BaseController
      * 获取机构管理详细信息
      */
     @ApiOperation("获取机构管理详细信息")
-    @PreAuthorize("@ss.hasPerm('business:organization:query')")
+    @PreAuthorize("@ss.hasPermi('business:organization:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {