Merge branch 'master' of http://192.168.0.27:8090/xuxu/yongxinda-admin

nginx/default.conf

@@ -16,6 +16,6 @@ server {
       }
   
   location /admin {
-    proxy_pass http://yongxinda:80;
+    proxy_pass http://yongxingda:80;
   }
 }
\ No newline at end of file