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: 90a77338eb0e1edade2478d4f6a7623e0298681a
+  newTag: 5c9d42db5cb127d2cba48906150273ad3709f642

src/pages/mallManage/mallGoods/goodsAddOrEditOrDetail/components/baseInfo/index.tsx

@@ -317,18 +317,15 @@ const BaseInfo = forwardRef<any, selfProps>((_props, ref) => {
             <Radio value={0}>不显示</Radio>
           </Radio.Group>
         </Form.Item>
-        <Form.Item label='关联课程' name='curriculumIds'>
+        <Form.Item label='关联教程' name='curriculumIds'>
           <Select
             mode='multiple'
             placeholder='请选择关联课程'
             value={baseInfoForm.getFieldValue('curriculumIds')} // 使用defaultCourseIds作为初始值
-            // onChange={handleCourseSelectionChange} // 假设已有处理课程选择变化的函数
             showSearch
             optionFilterProp='children'
             filterOption={(input, option) =>
-              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-              // @ts-expect-error
-              option?.children?.toLowerCase().includes(input.toLowerCase())
+              (option?.children as unknown as string)?.toLowerCase().includes(input.toLowerCase())
             }
           >
             {curriculumList.map((item) => (
@@ -339,9 +336,9 @@ const BaseInfo = forwardRef<any, selfProps>((_props, ref) => {
           </Select>
         </Form.Item>
         <Form.Item
-          label='方案文件'
+          label='产品说明书'
           name='instructionsUrl'
-          rules={[{ required: true, message: '请输入方案文件' }]}
+          rules={[{ required: true, message: '请上传产品说明书' }]}
         >
           <Uploader
             fileUpload
@@ -367,13 +364,9 @@ const BaseInfo = forwardRef<any, selfProps>((_props, ref) => {
               showSearch
               optionFilterProp='children' // 指定筛选的字段
               filterOption={(input, option) =>
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-expect-error
-                option?.children?.toLowerCase().includes(input.toLowerCase())
+                (option?.children as unknown as string)?.toLowerCase().includes(input.toLowerCase())
               }
               style={{ width: '380px' }}
-              // value={baseInfoForm.getFieldValue('gambitId')}
-              // onSelect={(e) => baseInfoForm.setFieldValue('gambitId', e)}
             >
               {gambitList.map((i, j) => (
                 <Option key={j} value={i.id}>

src/pages/systemManage/companyManage/companyMember/index.tsx

@@ -133,11 +133,7 @@ const CompanyMemberView = () => {
     {
       title: '操作',
       width: '15%',
-      onHeaderCell: () => ({
-        style: {
-          textAlign: 'center',
-        },
-      }),
+      align: 'center',
       render: (_text: string, record) => (
         <>
           <Button