Merge branch 'cloud' of http://115.238.142.158:20182/Ahrs/AHRS into cloud

ruoyi-admin/src/main/resources/templates/system/dept/edit.html

@@ -83,7 +83,7 @@
         }
 
         .input-group-addon{
-            background: #F3F3F3;
+            background: none;
             border: 1px solid #D1D1D1;
             border-radius: 4px;
         }
@@ -93,8 +93,8 @@
         }
 
         .form-control{
-            background: #F3F3F3;
-            border: 1px solid #D1D1D1;
+            /* background: #F3F3F3;
+            border: 1px solid #D1D1D1; */
             border-radius: 4px;
             height: 40px;
             line-height: 40px;
@@ -118,11 +118,13 @@
                 <div class="col-sm-4" >
                     <div class=""   >
                         <label><span style="color: red;margin-right: 5px; ">*</span>父机构</label>
-                        <input id="treeId" name="parentId" type="hidden" th:field="*{parentId}"/>
-                        <input class="form-control" type="text" style="background-color: white"
-                               onclick="selectDeptTree('treeId','treeName')"
-                               id="treeName"  th:field="*{parentName}">
-                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                        <div class="input-group date">
+                          <input id="treeId" name="parentId" type="hidden" th:field="*{parentId}"/>
+                          <input class="form-control" type="text" style="background-color: white"
+                                onclick="selectDeptTree('treeId','treeName')"
+                                id="treeName"  th:field="*{parentName}">
+                          <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                        </div>
                     </div>
                 </div>
                 <div class="col-sm-4" >

ruoyi-system/src/main/resources/templates/ahrs/personnel/editPart.html

@@ -74,6 +74,11 @@
             margin-bottom: 24px;
         }
 
+        .form-control{
+          height: 40px;
+          border-radius: 4px;
+        }
+
         .form-control[disabled], .form-control[readonly] {
             background: #F3F3F3;
             border: 1px solid #D1D1D1;