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
