734e65de by yangjianbin

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

2 parents 9e00ab48 b08860a7
......@@ -43,15 +43,15 @@
</div>
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" size="1" placeholder="用户名" column="9" name="userName">
<input type="text" class="form-control input-text table_search" value="" placeholder="用户名" column="9" name="userName">
</div>
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" size="1" placeholder="真实姓名" column="13" name="name">
<input type="text" class="form-control input-text table_search" value="" placeholder="真实姓名" column="13" name="name">
</div>
<div class="col-xs-2">
<input type="text" class="form-control input-text table_search" value="" size="1" placeholder="手机号" column="10" name="phone">
<input type="text" class="form-control input-text table_search" value="" placeholder="手机号" column="10" name="phone">
</div>
</div>
......@@ -66,6 +66,7 @@
</div>
</form>
<div class="body mt-20">
<table class="table table-border table-bordered table-bg" id="table" url="system/user/find">
<!-- system/user/getAllHr-->
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!