Merge branch 'master' into dev-v1.1

wupengfei

2 小时以前 7cf04da7eaba7cad9c3b5e5f674d2e038ebcd305

 apps/bMiniApp/src/subpackages/city/citySelect/citySelect.vue

@@ -43,7 +43,7 @@
      list: cityGroups[key].map((x) => ({
        name: x.areaName,
        id: x.areaCode,
        parentId: x.parentId,
        parentId: x.parentCode,
      })),
    });
  }