Merge branch 'dev' into test

src/views/warehouseManagement/stocktaking/plan/components/assignDialog.vue

@@ -49,7 +49,7 @@
               <el-form-item label="执行人员" prop="executorId">
                 <el-select
                   v-model="formData.executorId"
-                  @changeExecutor="executorChange"
+                  @change="executorChange"
                   size="small"
                   style="width: 100%"
                   filterable