解决冲突

beetlsql3-dev
姚丹ab 2 years ago
parent 551ddc669a
commit ee9d3bb328

@ -5,7 +5,6 @@
} }
</style> </style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}"> <layui:searchForm formId="searchForm" searchList="" condition="${search}">
<div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">专业名称</label> <label class="layui-form-label">专业名称</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
@ -13,8 +12,6 @@
autocomplete="off" class="layui-input"> autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
</div>
<div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">所属院校</label> <label class="layui-form-label">所属院校</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
@ -24,7 +21,6 @@
layFilter="select_universitiesColleges"/> layFilter="select_universitiesColleges"/>
</div> </div>
</div> </div>
</div>
</layui:searchForm> </layui:searchForm>
<div class="layui-btn-group"> <div class="layui-btn-group">
<div class="layui-btn-group"> <div class="layui-btn-group">

Loading…
Cancel
Save