Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-09-13 2af534eea471f4adb104906c7a814bcc66d4d68d

 docker/nginx/nginx.conf

@@ -22,6 +22,7 @@
    access_log  /var/log/nginx/access.log  main;

   upstream server {
       ip_hash;
      server 172.30.0.60:8080;
      server 172.30.0.61:8080;
   }