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: 0b0ec4df915f6021e70875bebebb90717ec3681f
+  newTag: ee4bc5d24f9b1a25033deee49c02721ecb8d2ba3

src/pages/categoryManage/serviceCategoryList/comp/addEditModal/index.tsx

@@ -90,7 +90,7 @@ const AddEditModalView: React.FC<ModalProps & selfProps> = ({ open, title, onCan
           name='description'
           rules={[{ required: true, message: '请输入分类描述' }]}
         >
-          <Input placeholder='请输入分类名称' maxLength={25} allowClear />
+          <Input placeholder='请输入分类描述' maxLength={25} allowClear />
         </Form.Item>
       </Form>
     </Modal>