Merge branch 'feature/order_edit' into pre-release

src/views/ecw/order/edit.vue

@@ -522,9 +522,9 @@
             <div class="form-section" v-if="form.harvestMethod == 2">
               <el-form-item :label="$t('收货地区')" prop="country">
                 <area-selector
-                  :country="form.consigneeVO ? form.consigneeVO.country : undefined"
-                  :province="form.consigneeVO ? form.consigneeVO.province : undefined"
-                  :city="form.consigneeVO ? form.consigneeVO.city : undefined"
+                  :country="form.country"
+                  :province="form.province"
+                  :city="form.city"
                   @countryChange="onAreaChange('country', $event)"
                   @provinceChange="onAreaChange('province', $event)"
                   @cityChange="onAreaChange('city', $event)"