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

src/pages/launchSystemV3/adqv3/ad/updateAd3.tsx

@@ -326,7 +326,7 @@ const UpdateAd3: React.FC<Props> = ({ visible, type, onClose, onChange, updateDa
                         rules={[{ required: true, message: '请选择智能定向!' }]}
                     >
                         <Radio.Group defaultValue="a" buttonStyle="solid">
-                            <Radio.Button value="SMART_TARGETING_OPEN" disabled>开启</Radio.Button>
+                            <Radio.Button value="SMART_TARGETING_OPEN">开启</Radio.Button>
                             <Radio.Button value="SMART_TARGETING_MANUAL">关闭</Radio.Button>
                         </Radio.Group>
                     </Form.Item> : null}

src/pages/launchSystemV3/monitorEWList/tableConfig.tsx

@@ -414,6 +414,26 @@ export const LocalCsgroupDayListTableConfig = (): ColumnsType<never> => {
                 return <span style={{ fontSize: 12 }}>{value}</span>
             },
         },
+        {
+            title: '客服组当日限制加粉数',
+            dataIndex: 'limitAddFansOfDay',
+            key: 'limitAddFansOfDay',
+            width: 100,
+            align: 'right',
+            render(value) {
+                return <span style={{ fontSize: 12 }}>{value}</span>
+            },
+        },
+        {
+            title: '客服组当日剩余加粉数',
+            dataIndex: 'surplusAddFansOfDay',
+            key: 'surplusAddFansOfDay',
+            width: 100,
+            align: 'right',
+            render(value) {
+                return <span style={{ fontSize: 12 }}>{value}</span>
+            },
+        },
         {
             title: '数据更新时间',
             dataIndex: 'dataTime',