Merge branch 'dev' of git.yfzx.zjtys.com.cn:matrix/device-back into feature-check

dev-config/src/main/java/com/tykj/dev/config/UnifiedReturnConfig.java

@@ -43,17 +43,17 @@ public class UnifiedReturnConfig implements ResponseBodyAdvice<Object> {
             return body;
         }
 
-        ResultObj<Object> result = new ResultObj<>(body, "成功 :)");
-
-        // 如果返回的是字符串，则要对其做JSON序列化
-        if (body.getClass().equals(String.class)) {
-            try {
-                response.getHeaders().set("Content-Type", "application/json;charset=utf-8");
-                return objectMapper.writeValueAsString(result);
-            } catch (JsonProcessingException e) {
-                e.printStackTrace();
-            }
-        }
+        ResultObj<Object> result = new ResultObj<>(body, "成功");
+
+//         如果返回的是字符串，则要对其做JSON序列化
+//        if (body.getClass().equals(String.class)) {
+//            try {
+//                response.getHeaders().set("Content-Type", "application/json;charset=utf-8");
+//                return objectMapper.writeValueAsString(result);
+//            } catch (JsonProcessingException e) {
+//                e.printStackTrace();
+//            }
+//        }
 
         // 其他的类型直接封装返回
         return result;