Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0

Application/Admin/Common/extend.php

@@ -1552,9 +1552,9 @@ function getAdminData ($uid) {
         ->join('left join sys_auth_group on sys_auth_group_access.group_id=sys_auth_group.id')
         ->where(array('uid'=>$uid))->find();
 
-    $promoteData = M('promote','tab_')->field('id')->where(array('admin_id'=>$uid))->select();
-    $promoteData = implode(',',array_column($promoteData,'id'));
-    $adminData['data_president'] = $adminData['data_president'].','.$promoteData;
+//    $promoteData = M('promote','tab_')->field('id')->where(array('admin_id'=>$uid))->select();
+//    $promoteData = implode(',',array_column($promoteData,'id'));
+//    $adminData['data_president'] = $adminData['data_president'].','.$promoteData;
 
     return $adminData;
 }

Public/Admin/css/select2.min.css

@@ -7,7 +7,7 @@
 .select2-container .select2-search--inline{float:left;}
 .select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;margin-top:5px;border:none;font-size:100%;}
 .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none;}
-.select2-dropdown{position:absolute;left:-100000px;z-index:1051;display:block;box-sizing:border-box;width:100%;border:1px solid #aaa;border-radius:4px;background-color:#fff;}
+.select2-dropdown{position:absolute;left:-100000px;z-index:10;display:block;box-sizing:border-box;width:100%;border:1px solid #aaa;border-radius:4px;background-color:#fff;}
 .select2-results{display:block;}
 .select2-results__options{margin:0;padding:0;list-style:none;}
 .select2-results__option{padding:6px;user-select:none;-webkit-user-select:none;}