From 96928bdb692c62e01105d1d6a7f4bd04df5aa3c0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 十月 2025 16:39:08 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DrDisplacementController.java | 7 -------
1 files changed, 0 insertions(+), 7 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..9a9631c 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,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
-<<<<<<< HEAD
-=======
->>>>>>> origin/master
import org.springframework.web.bind.annotation.RestController;
/**
@@ -25,7 +22,3 @@
public class DrDisplacementController {
}
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/master
--
Gitblit v1.7.1