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

fuliqi

2024-07-10 254c2a69441dbd9ee9bcb1d134a05eb9da407d17

 src/main/java/com/ycl/jxkg/config/spring/security/RestUtil.java

@@ -52,7 +52,7 @@
     */
    public static void response(HttpServletResponse response, int systemCode, String msg, Object content) {
        try {
            Result res = new Result<>(systemCode, msg, content);
            Result res = Result.response(systemCode, msg, content);
            String resStr = JsonUtil.toJsonStr(res);
            response.setContentType("application/json;charset=utf-8");
            response.getWriter().write(resStr);