Merge branch 'dev-mysql' into feature_release-tomysql

src/main/webapp/resources/view/vendor/modal/vendor_distributor_manage.html

@@ -24,6 +24,8 @@
         padding-bottom: 5px;
         border-radius: 3px;
         min-height: 34px;
+        max-height: 94px;
+        overflow-y: auto;
     }
     .dis-manage-header-item {
         display: inline-block;