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-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java
index 176b1af..2942d5e 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java
@@ -32,7 +32,6 @@
private THouseService tHouseService;
@ApiOperation(value = "查询房屋信息")
@GetMapping(value = "/getHouseById")
- @PreAuthorize("@ss.hasPermi('system:house:detail')")
public R<THouse> getHouseById(@RequestParam String id) {
THouse tHouse = tHouseService.getById(id);
tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
--
Gitblit v1.7.1