Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/proposal/CategoryProposalController.java

@@ -38,11 +38,11 @@ public class CategoryProposalController extends BaseController
     @Autowired
     private ICategoryProposalService categoryProposalService;
 
-/**
- * 查询提案类别列表
- */
-@PreAuthorize("@ss.hasPermi('category:proposal:list')")
-@GetMapping("/list")
+    /**
+     * 查询提案类别列表
+     */
+    @PreAuthorize("@ss.hasPermi('category:proposal:list')")
+    @GetMapping("/list")
     public TableDataInfo list(CategoryProposal categoryProposal)
     {
         //startPage();
@@ -109,7 +109,6 @@ public class CategoryProposalController extends BaseController
     /**
      * 获取提案类别树列表
      */
-    @PreAuthorize("@ss.hasPermi('category:proposal:treelist')")
     @GetMapping("/categoryTree")
     public AjaxResult categoryTree(CategoryProposal categoryProposal)
     {
@@ -119,7 +118,6 @@ public class CategoryProposalController extends BaseController
     /**
      * 查询提案类别列表（排除节点）
      */
-    @PreAuthorize("@ss.hasPermi('category:proposal:list')")
     @GetMapping("/list/exclude/{categoryId}")
     public AjaxResult excludeChild(@PathVariable(value = "categoryId", required = false) Long categoryId)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/proposal/ProposalInfoController.java

@@ -51,7 +51,6 @@ public class ProposalInfoController extends BaseController
     /**
      * 列表页统计
      */
-    @PreAuthorize("@ss.hasPermi('proposalInfo:info:statistics')")
     @GetMapping("/list/statistics")
     public AjaxResult statistics(ProposalInfo proposalInfo)
     {