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: 7fb45ae794b33eef3f946c74d4e7a7d5ff091c0c
+  newTag: ebb3ca94f87fc54448b50da02e224c6b7862f2b1

src/pages/pilotTraining/courseManage/comp/addEditModal/index.tsx

@@ -107,7 +107,7 @@ const AddEditModal: React.FC<propType> = (props) => {
       // 回显数据
       form.setFieldsValue({
         ...data,
-        courseId: [oneCourseId?.id, twoCourseId?.id],
+        courseId: [oneCourseId?.id, twoCourseId?.id] as any,
       });
       setCourseAttributeSelect(data?.courseAttribute || 0);
     }
@@ -187,9 +187,9 @@ const AddEditModal: React.FC<propType> = (props) => {
           </div>
         </Form.Item>
         <Form.Item
-          label='课程上传'
+          label='课程视频'
           name='videoUrl'
-          rules={[{ required: false, message: '请上传课程上传' }]}
+          rules={[{ required: true, message: '请上传课程视频' }]}
           style={{ marginBottom: '-40px' }}
         >
           <div>