From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java
index e35db1f..96e1b44 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java
@@ -44,7 +44,7 @@
/**
* 获取维修物品分类管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:itemType:list')")
+ @PreAuthorize("@ss.hasPermi('houseManage:class_list')")
@ApiOperation(value = "获取维修物品分类分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TItemType>> pageList(@RequestBody TItemTypeQuery query) {
@@ -54,7 +54,6 @@
/**
* 获取维修物品分类管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:itemType:list')")
@ApiOperation(value = "获取维修物品分类列表")
@PostMapping(value = "/list")
public R<List<TItemType>> list() {
@@ -64,7 +63,7 @@
/**
* 添加维修物品分类管理
*/
- @PreAuthorize("@ss.hasPermi('system:itemType:add')")
+ @PreAuthorize("@ss.hasPermi('houseManage:class:add')")
@Log(title = "维修物品分类信息-新增维修物品分类", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加维修物品分类")
@PostMapping(value = "/add")
@@ -78,7 +77,7 @@
/**
* 修改维修物品分类
*/
- @PreAuthorize("@ss.hasPermi('system:itemType:update')")
+ @PreAuthorize("@ss.hasPermi('houseManage:class:edit')")
@Log(title = "维修物品分类信息-修改维修物品分类", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改维修物品分类")
@PostMapping(value = "/update")
@@ -92,7 +91,7 @@
/**
* 查看维修物品分类详情
*/
- @PreAuthorize("@ss.hasPermi('system:itemType:detail')")
+ @PreAuthorize("@ss.hasPermi('houseManage:class:edit')")
@ApiOperation(value = "查看维修物品分类详情")
@GetMapping(value = "/getDetailById")
public R<TItemType> getDetailById(@RequestParam String id) {
@@ -102,7 +101,7 @@
/**
* 删除维修物品分类
*/
- @PreAuthorize("@ss.hasPermi('system:itemType:delete')")
+ @PreAuthorize("@ss.hasPermi('houseManage:class:delete')")
@Log(title = "维修物品分类信息-删除维修物品分类", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除维修物品分类")
@DeleteMapping(value = "/deleteById")
@@ -117,7 +116,7 @@
/**
* 批量删除维修物品分类
*/
- @PreAuthorize("@ss.hasPermi('system:itemType:delete')")
+ @PreAuthorize("@ss.hasPermi('houseManage:class:delete')")
@Log(title = "维修物品分类信息-删除维修物品分类", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除维修物品分类")
@DeleteMapping(value = "/deleteByIds")
--
Gitblit v1.7.1