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

@@ -43,21 +43,22 @@
             </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="1" name="userName">
+                <input type="text" class="form-control input-text table_search" value="" size="1" placeholder="用户名" column="9" 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="2" name="name">
+                <input type="text" class="form-control input-text table_search" value=""  size="1" placeholder="真实姓名" column="13" name="name">
             </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="phone">
+                <input type="text" class="form-control input-text table_search" value=""  size="1" placeholder="手机号" column="10" name="phone">
             </div>
             </div>
 
 
         </div>
         </div>
 
 
 
 
 
 
+
         <div>
         <div>
             <button class="btn btn-primary radius" type="button" onclick="$('#table').DataTable().draw()">搜索</button>
             <button class="btn btn-primary radius" type="button" onclick="$('#table').DataTable().draw()">搜索</button>
             <input class="btn btn-warning radius" type="reset" value="重置搜索">
             <input class="btn btn-warning radius" type="reset" value="重置搜索">