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

疯狂的狮子li

2021-10-27 695cb6d76b838b1e4cb161bae335faa948dca12a

 ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java

@@ -72,7 +72,8 @@
         return null;
      }
      try {
         return objectMapper.readValue(text, new TypeReference<Map<String, T>>() {});
            return objectMapper.readValue(text, new TypeReference<Map<String, T>>() {
            });
      } catch (IOException e) {
         throw new RuntimeException(e);
      }