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

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysWebServiceImpl.java

@@ -430,7 +430,10 @@ public class SysWebServiceImpl implements ISysWebService {
                 "\n" +
                 "\n" +
                 "    index index.html index.htm;\n" +
-                "\n";
+                "\n" +
+                "     location / {\n" +
+                "                try_files $uri $uri/ /index.html?$args;\n" +
+                "        }\n" ;
         if(plat==2){
             configParam += "     location ^~ /seller/ {\n" +
                     "                try_files $uri $uri/ /seller/index.html?$args;\n" +