Merge branch 'master' of hyq/kmall-pt into master

kmall-common/src/main/java/com/kmall/common/utils/ServletUtils.java

@@ -31,7 +31,7 @@ public class ServletUtils {
     public static final long ONE_YEAR_SECONDS = 60 * 60 * 24 * 365;
 
     // 静态文件后缀
-    private final static String[] staticFiles = StringUtils.split(ResourceUtil.getConfigByName("\\conf\\servlet", "web.staticFile"), ",");
+    private final static String[] staticFiles = StringUtils.split(ResourceUtil.getConfigByName("/conf/servlet", "web.staticFile"), ",");
 
 
     /**