Merge branch 'master' of http://47.109.151.80:15030/yangzhenghui/ZhAgent

ui/nginx.conf

@@ -17,7 +17,6 @@ server {
     }
 
     location /admin {
-        rewrite ^/admin(/.*)$ $1 break;
         proxy_pass http://maxkb-web:8080;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;