Merge branch '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: 08fc0665d8a868456bb6f81244d7566c30404020
+  newTag: 375c14c25c086f65428c8e7063cad6c58f532ee9

src/pages/resourceManage/storeDecorate/comp/storeFormView/index.tsx

@@ -150,9 +150,9 @@ const StoreFormView: React.FC<{
           <Input placeholder={'请输入企业名称'} maxLength={25} allowClear />
         </Form.Item>
         <Form.Item
-          label='公司地址'
+          label='企业地址'
           name='address'
-          rules={[{ required: true, message: '请选择公司地址' }]}
+          rules={[{ required: true, message: '请选择企业地址' }]}
         >
           <Input
             value={detail?.address}
@@ -193,25 +193,25 @@ const StoreFormView: React.FC<{
           </Uploader>
         </Form.Item>
         <Form.Item
-          label='公司简介'
+          label='企业简介'
           name='content'
-          rules={[{ required: true, message: '请输入公司简介' }]}
+          rules={[{ required: true, message: '请输入企业简介' }]}
         >
           <Input.TextArea
-            placeholder={'请输入公司简介（“；”号换行）'}
+            placeholder={'请输入企业简介（“；”号换行）'}
             maxLength={140}
             allowClear
             showCount
           />
         </Form.Item>
-        <Form.Item label='公司宣传片' name='videoList'>
+        <Form.Item label='企业宣传片' name='videoList'>
           <Uploader
             fileUpload
             listType='picture-card'
             defaultFileList={videoList}
             onChange={videoListChange}
             fileLength={1}
-            fileType={['video/mp4', 'video/avi', 'video/wmv', 'video/rmvb']}
+            fileType={['video/mp4', 'video/avi', 'video/wmv', 'video/rmvb', 'video/mov']}
             fileSize={100}
           >
             <UploadOutlined />