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

xiangpei

2024-07-04 626bb3aa189053a742cf04f66929f2a54fc9695c

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