Merge branch 'master' of https://git.oschina.net/52itstyle/spring-boot-pay

src/main/resources/application-dev.properties

@@ -30,11 +30,8 @@ spring.thymeleaf.cache-period=0
 spring.thymeleaf.template.cache=false
 # 静态文件请求匹配方式
 spring.mvc.static-path-pattern=/**
-<<<<<<< HEAD
-# \u4fee\u6539\u9ed8\u8ba4\u7684\u9759\u6001\u5bfb\u5740\u8d44\u6e90\u76ee\u5f55 \u591a\u4e2a\u4f7f\u7528\u9017\u53f7\u5206\u9694
-=======
+
 # 修改默认的静态寻址资源目录 多个使用逗号分隔
->>>>>>> 5bfb4699001880d31b2135f570c840ffd3efc64a
 spring.resources.static-locations = classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,classpath:/templates/
 
 #============================#