From 053c2264ab5d7596aea3f8fcac18d487e6f9c766 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 18:47:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DrDisplacementController.java | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DrDisplacementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DrDisplacementController.java
index 833acb5..a916c9a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DrDisplacementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DrDisplacementController.java
@@ -2,10 +2,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/master
import org.springframework.web.bind.annotation.RestController;
/**
@@ -13,11 +9,7 @@
* 拆迁情况 前端控制器
* </p>
*
-<<<<<<< HEAD
* @author mitao
-=======
- * @author WuGuanFengYue
->>>>>>> origin/master
* @since 2025-10-17
*/
@RestController
@@ -25,7 +17,3 @@
public class DrDisplacementController {
}
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/master
--
Gitblit v1.7.1