Merge remote-tracking branch 'origin/master'

zengh

2021-04-27 4360b46a4b254e7b54d65e9c4907506a455dec2b

Merge remote-tracking branch 'origin/master'

 src/views/clientManagement/clientManagement.vue

@@ -707,7 +707,6 @@
              }else{
                  that.form.city = val.addressComponent.city;
              }
              
              that.form.district = val.addressComponent.district;
            });
          }

 src/views/system/cs.vue

@@ -730,7 +730,11 @@
          }
          //写入新的省市区
          that.form.province = val.addressComponent.province;
          that.form.city = val.addressComponent.city;
          if(val.addressComponent.city==""){
              that.form.city = val.addressComponent.province;
          }else{
              that.form.city = val.addressComponent.city;
          }
          that.form.district = val.addressComponent.district;
        }
      },