Merge branch 'trunk' of https://git.littlefat.tech/magic-csb/boluo-admin-main into trunk

# Conflicts:
#	src/requestConfig.ts

docker-compose.yml

@@ -9,7 +9,7 @@ services:
     ports:
       - "5000:5000"
     environment:
-      - BASE_URL=http://192.168.60.120:8082
+      - BASE_URL=http://192.168.60.191:8082
     env_file:
       - .env
     restart: unless-stopped

mock/list.ts

@@ -20,6 +20,8 @@ const genJobList = (current: number, pageSize: number) => {
       publisher: '甲子',
       blPublisherId: `${index}-blPublisherId`,
       publisherAcctNo: `${index}-publisherAcctNo`,
+      phone: `${index}-phone`,
+      acctNo: `${index}-acctNo`,
       blGroupId: `${index}-blGroupId`,
       imGroupId: `${index}-imGroupId`,
       imGroupNick: '杭州主播群3',

src/pages/table-list/job/index.tsx

@@ -74,6 +74,20 @@ const TableList: React.FC = () => {
       search: false,
       copyable: true,
     },
+    {
+      title: '通告微信号',
+      dataIndex: 'acctNo',
+      valueType: 'textarea',
+      search: false,
+      copyable: true,
+    },
+    {
+      title: '通告手机号',
+      dataIndex: 'phone',
+      valueType: 'textarea',
+      search: false,
+      copyable: true,
+    },
     {
       title: '发布人昵称',
       dataIndex: 'publisher',

src/services/typings.d.ts

@@ -66,6 +66,10 @@ declare namespace API {
     robotImNick: string;
     // 机器人微信号
     robotImNo: string;
+    // 通告微信号
+    acctNo
+    // 通告手机号
+    phone
     // 通告发布群数量
     relateGroupCount: number;
     // 创建时间，时间戳