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

src/pages/launchSystemNew/launchManage/taskList/logTableConfig.tsx

@@ -138,7 +138,7 @@ function tableConfig(copyCreative: (data: any) => void, callback: (data: any) =>
             ellipsis: true,
             render: (a: any, b: any) => {
                 if (a) {
-                    return <AdcreativePopover id={a} name={b?.sysAdcreativeInfo?.adcreativeName} />
+                    return <AdcreativePopover id={a} name={b?.sysAdcreative?.adcreativeName} />
                 } else {
                     return <span>--</span>
                 }

src/pages/launchSystemNew/launchManage/taskList/tableConfig.tsx

@@ -100,7 +100,7 @@ function tableConfig(callback: (data: any, type: 'log' | 'page', allData?: any)
             ellipsis: true,
             render: (a: any, b: any) => {
                 if (a) {
-                    return <AdPopover name={b?.sysAdgroupInfo?.adgroupName} id={a} />
+                    return <AdPopover name={b?.sysAdgroup?.adgroupName} id={a} />
                 } else {
                     return <span>--</span>
                 }