Merge remote-tracking branch 'origin/develop' into develop

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: b3dee61cd4e3901a9df83c06b2cd5b0c94a61649
+  newTag: c19acbbd8888d750578f6ceb173bb24c0f3fecef

src/pages/categoryManage/serviceCategoryList/index.tsx

@@ -289,7 +289,7 @@ function ServiceCategoryList() {
         }}
       />
       <AddEditChildrenView
-        title={recordData ? '编辑子分类' : '新增子分类'}
+        title={recordChildData ? '编辑子分类' : '新增子分类'}
         open={addEditChildVisible}
         data={recordChildData}
         id={Number(recordData?.id)}

src/pages/mallManage/serviceManage/serviceDetail/index.tsx

@@ -345,7 +345,7 @@ function ServiceDetailView() {
           ]}
         >
           <Cascader
-            placeholder={'请选择所属行业'}
+            placeholder={'请选择所属服务'}
             options={industryList}
             allowClear
             onChange={(e) => {