Merge branch 'develop' of http://git.zanxiangnet.com/wjx/ad-manage

src/pages/launchSystemV3/tencenTasset/corpWechat/csgroup/components/group/index.tsx

@@ -129,7 +129,7 @@ const Group: React.FC<{ adAccountId?: number }> = ({ adAccountId }) => {
             >新增</Button>
         </div>
         <Table
-            columns={columns(handleEdit, adAccountId)}
+            columns={columns(handleEdit)}
             dataSource={getCustomerServiceGroupList.data?.records}
             size="small"
             loading={getCustomerServiceGroupList?.loading}

src/pages/launchSystemV3/tencenTasset/corpWechat/csgroup/components/group/tableConfig.tsx

@@ -3,7 +3,7 @@ import React from "react"
 import { EditOutlined } from "@ant-design/icons"
 import GroupUserInfo from "./groupUserInfo"
 
-const columns = (handleEdit: (data: any) => void, adAccountId?: number): TableProps<any>['columns'] => {
+const columns = (handleEdit: (data: any) => void): TableProps<any>['columns'] => {
 
     return [
         {
@@ -103,7 +103,7 @@ const columns = (handleEdit: (data: any) => void, adAccountId?: number): TablePr
             render(_, record) {
                 return <Space>
                     {/* <UserInfo userInfoList={record.userInfoList} createTime={record.createTime} groupMemberCnt={record.groupMemberCnt} /> */}
-                    {record.type == 1 && <GroupUserInfo adAccountId={adAccountId} groupData={record} />} 
+                    {record.type == 1 && <GroupUserInfo adAccountId={record.accountId} groupData={record} />} 
                     <Button icon={<EditOutlined />} style={{ border: 'none', fontSize: 12 }} size='small' onClick={() => handleEdit(record)}>修改</Button>
                 </Space>
             }