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: b288cd44e454bacbf5e49016c84b791ba1d7f086
+  newTag: 465e507b3079097b231424c6de372ba1ba672b14

src/pages/categoryManage/directoryManage/components/addOrEditDec/index.tsx

@@ -29,15 +29,15 @@ const typeOptions = [
   },
   {
     value: 2,
-    label: '设备分类',
+    label: '设备租赁分类',
   },
   {
     value: 3,
-    label: '飞手分类',
+    label: '飞手服务分类',
   },
   {
     value: 4,
-    label: '商城分类',
+    label: '产品商城分类',
   },
 ];
 
@@ -121,7 +121,12 @@ const AddOrEditDec: React.FC<PropsType & selfPropsType> = ({
         style={{ marginBottom: 40 }}
       >
         <Form.Item label='分类模块' name='type' rules={[{ required: true }]}>
-          <Select options={typeOptions} allowClear={true} onChange={onChangeType}></Select>
+          <Select
+            options={typeOptions}
+            allowClear={true}
+            onChange={onChangeType}
+            placeholder='请选择分类模块'
+          ></Select>
         </Form.Item>
         {/*  <Form.Item label='目录类型'>
           <Radio.Group onChange={(e: RadioChangeEvent) => setHasPid(e.target.value)} value={hasPid}>