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

xiangpei

2024-07-01 55dd8a6e104190531b51402ad0be6eba0b7d6877

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