Merge remote-tracking branch 'origin/master'

pqs-common/common-core/src/main/java/com/njcn/common/utils/PubUtils.java

@@ -154,7 +154,7 @@ public class PubUtils {
             MAPPER.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
             return MAPPER.writeValueAsString(object);
         } catch (IOException e) {
-            throw new IllegalArgumentException("将将实体对象转为JSON时发生错误:" + object, e);
+            throw new IllegalArgumentException("将实体对象转为JSON时发生错误:" + object, e);
         }
     }
 

pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java

@@ -75,7 +75,9 @@ public class Knife4jSwaggerConfig {
                 "com.njcn.stat.controller",
                 "com.njcn.rt.controller",
                 "com.njcn.zlevent.controller",
-                "com.njcn.cloud.controller"
+                "com.njcn.cloud.controller",
+                "com.njcn.zlevent.controller",
+                "com.njcn.prepare"
                 )
                 .collect(Collectors.toList());
         List<GrantType> grantTypes = new ArrayList<>();