Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into develop

.eslintrc.js

@@ -10,6 +10,6 @@ module.exports = {
   rules: {
     "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
     "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
-		"endOfLine": 0,
+		"endOfLine": auto,
   },
 };

src/views/system/user/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <SearchTemplate>
-			<el-form :inline="true">
+			<el-form :inline="true" class="clearfix search-content">
         <el-form-item label="用户名称">
           <el-input v-model="queryParams.name" placeholder="请输入用户名称" clearable style="width: 240px" />
         </el-form-item>