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

@@ -30,7 +30,34 @@
                     </select>
                     </select>
                 </span>
                 </span>
             </div>
             </div>
+            <div class="col-xs-2">
+                <span class="select-box">
+                    <select class="select table_search" size="1" column="2" name="role">
+                            <option value="" selected>状态</option>
+                            <option value="1">正常</option>
+                            <option value="2">冻结</option>
+                            <option value="3">失效</option>
+                            <option value="4">过期</option>
+                     </select>
+                </span>
+            </div>
+        </div>
+
+        <div class="row cl mb-20">
+            <div class="form-group col-sm-4 col-md-2">
+                <label>用户名</label>
+                <input type="text" class="form-control input-text" name="userName" value="">
+            </div>
+            <div class="form-group col-sm-4 col-md-2">
+                <label>真实姓名</label>
+                <input type="text" class="form-control input-text" name="name" value="">
+            </div>
+            <div class="form-group col-sm-4 col-md-2">
+                <label>手机号</label>
+                <input type="text" class="form-control input-text"  name="phone" value="">
+            </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="重置搜索">