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

Application/Admin/View/PromoteCompany/lists.html

@@ -32,15 +32,15 @@
         .data_game_list table td{
             line-height:1;
             padding: 3px;
+            height: 30px;
         }
+        
     </style>
 
     <div class="cf main-place top_nav_list navtab_list">
         <h3 class="page_title">{$meta_title}</h3>
         <p class="description_text">说明：该功能是用于录入工会所属的推广公司名称</p>
     </div>        
-    <div class="jssearch search_list fl cf">
-        
     <div class="cf top_nav_list">
         <div class="fl button_list">
             <div class="tools">