合并分支 'lihong' 到 'master'

修改



查看合并请求 !114

@@ -22,7 +22,7 @@
             overflow-y: scroll;
             overflow-y: scroll;
         }
         }
         .footer {
         .footer {
-            display: flex;
+            /*display: flex;*/
             /*position: relative;*/
             /*position: relative;*/
             height: 1rem;
             height: 1rem;
             color: #BBBBBB;
             color: #BBBBBB;