Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/webapp/view/unorganizedMap.jsp

@@ -17,8 +17,8 @@
        }
        #box {
            width:300px;
            height:500px;
            top:80px;
            height:400px;
            top:30px;
            right:30px;
            position:absolute;
            z-index:1;