Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2024-07-05 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce

 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";