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
