Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

@@ -7,7 +7,7 @@
         <div class="row cl mb-20">
         <div class="row cl mb-20">
             <div class="col-xs-2">
             <div class="col-xs-2">
                 <span class="select-box">
                 <span class="select-box">
-                    <select class="select table_search" size="1" name="departmentId">
+                    <select class="select table_search" size="1" column="6" name="departmentId">
                         <option value="" selected>网点</option>
                         <option value="" selected>网点</option>
                         <?php foreach ($this->session->departments as $k=>$v):?>
                         <?php foreach ($this->session->departments as $k=>$v):?>
                             <option value="<?=$v->id?>"><?=$v->name?></option>
                             <option value="<?=$v->id?>"><?=$v->name?></option>
@@ -22,7 +22,7 @@
             </div>
             </div>
             <div class="col-xs-2">
             <div class="col-xs-2">
                 <span class="select-box">
                 <span class="select-box">
-                    <select class="select table_search" size="1" column="2" name="role">
+                    <select class="select table_search" size="1" column="5" name="role">
                         <option value="" selected>角色</option>
                         <option value="" selected>角色</option>
                         <?php foreach ($this->session->role as $k=>$v):?>
                         <?php foreach ($this->session->role as $k=>$v):?>
                             <option value="<?=$v->id?>"><?=$v->nameZh?></option>
                             <option value="<?=$v->id?>"><?=$v->nameZh?></option>
@@ -43,11 +43,11 @@
             </div>
             </div>
 
 
             <div class="col-xs-2">
             <div class="col-xs-2">
-                <input type="text" class="form-control input-text table_search" value="" placeholder="用户名" column="3" name="userName">
+                <input type="text" class="form-control input-text table_search" value="" placeholder="用户名" column="1" name="userName">
             </div>
             </div>
 
 
             <div class="col-xs-2">
             <div class="col-xs-2">
-                <input type="text" class="form-control input-text table_search" value="" placeholder="真实姓名" column="3" name="name">
+                <input type="text" class="form-control input-text table_search" value="" placeholder="真实姓名" column="2" name="name">
             </div>
             </div>
 
 
             <div class="col-xs-2">
             <div class="col-xs-2">