Merge branch 'merge&mdm0417' into master_merge_0523

# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
#	lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java

lms/nladmin-ui/src/views/login.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="login" :style="'background-image:url('+ Background +');'">
-    <img v-if="logo" :src="logo" class="sidebar-logo2" />
+    <img v-if="logo" :src="logo" class="sidebar-logo2">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        {{title}}</h3>
+        {{ title }}</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -58,7 +58,7 @@ export default {
       codeUrl: '',
       cookiePass: '',
       loginForm: {
-        username: 'admin',
+        username: '',
         password: '',
         rememberMe: false,
         code: '',