Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-29 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d

 src/main/java/com/ycl/jxkg/controller/ErrorController.java

@@ -15,7 +15,7 @@
import java.util.HashMap;
import java.util.Map;

@RestController
//@RestController
public class ErrorController extends BasicErrorController {

    private static final String PATH = "/error";