解决冲突

web/src/main/resources/templates/jlw/universitySystem/index.html

@@ -5,24 +5,20 @@
     }
 </style>
 <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">
+            <input type="text" id="universitySystemName" name="universitySystemName" placeholder=""
-                <input type="text" id="universitySystemName" name="universitySystemName" placeholder=""
+                   autocomplete="off" class="layui-input">
-                       autocomplete="off" class="layui-input">
-            </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">
+            <layui:simpleDictSelect style='layui-input-inline'
-                <layui:simpleDictSelect style='layui-input-inline'
+                                    type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
-                                        type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
+                                    id="universitiesCollegesId" name="universitiesCollegesId"
-                                        id="universitiesCollegesId" name="universitiesCollegesId"
+                                    layFilter="select_universitiesColleges"/>
-                                        layFilter="select_universitiesColleges"/>
-            </div>
         </div>
     </div>
 </layui:searchForm>