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