Merge branch 'dev' into test

src/views/modules/plugins/change/resideath.vue

@@ -86,7 +86,7 @@
               <el-button @click="joinBlacklist(scope.row)"
                        type="text"
                        size="small"
-                       class="div-table-button--detail">迁入死亡人口</el-button>
+                       class="div-table-button--detail">新增死亡人口</el-button>
             <!-- <el-button @click="handleLook(scope.row)"
                        type="text"
                        size="small"
@@ -261,8 +261,8 @@
                  :userId="lookInfo.userId"
                  :gridName="lookInfo.gridName"
                  @close="handleCancleLook" />
-    <el-dialog title="迁入死亡人口的原因" :visible.sync="blacklistVisible" width="40%">
+    <el-dialog title="新增死亡人口的原因" :visible.sync="blacklistVisible" width="40%">
-      <textarea v-model="blacklistReason" placeholder="请输入迁入死亡人口的原因" class="blacklist-reason"></textarea>
+      <textarea v-model="blacklistReason" placeholder="请输入新增死亡人口的原因" class="blacklist-reason"></textarea>
       <div>
         <br/>
       </div>