Merge remote-tracking branch 'origin/master'

src/views/business/dayworkUpdate/turnoverForm.vue

@@ -114,7 +114,7 @@
                 </el-popover>
                 <div>周转区</div>
               </template>
-              <div>{{ form.place }}</div>
+              <div>{{ form.turnoverType == '2' ? form.turnoverArea : form.place }}</div>
             </el-form-item>
           </el-col>
           <el-col :span="9" v-else-if="form.turnoverType == '1' && form.isQuick == 0">