Merge branch 'master' of http://git.cc-lotus.info/live/web-live

src/views/admin/model/frame.vue

@@ -49,7 +49,8 @@ export default {
   }
   .right {
     width: 935px;
-    min-height: 630px;
+    height: 630px;
+    overflow-y: auto;
     background: #fff;
   }
 }