fix

src/components/QueryForm/index.tsx

@@ -957,7 +957,9 @@ const QueryForm: React.FC<Props> = (props) => {
                         }
                         loading={getGameServerList.loading}
                     >
-                        {(isIsParticipateMerge && isParticipateMerge) ? getGameUnMergeServerList?.data?.filter((item: { isSourceServer: any }) => (isIsMergeServer && ((!isMergeServer && item.isSourceServer) || (isMergeServer && !item.isSourceServer))) || !isIsMergeServer)?.map((item: any) => <Select.Option value={item.serverId} key={item.serverId}>{item.serverName}</Select.Option>) : getGameServerList?.data?.filter((item: { isSourceServer: any }) => (isIsMergeServer && ((!isMergeServer && item.isSourceServer) || (isMergeServer && !item.isSourceServer))) || !isIsMergeServer)?.map((item: any) => <Select.Option value={item.serverId} key={item.serverId}>{item.serverName}</Select.Option>)}
+                        {(isIsParticipateMerge && isParticipateMerge)
+                            ? getGameUnMergeServerList?.data?.filter((item: { isSourceServer: any }) => (isIsMergeServer && ((!isMergeServer && item.isSourceServer) || (isMergeServer && !item.isSourceServer))) || !isIsMergeServer)?.map((item: any) => <Select.Option value={item.serverId} key={item.serverId}>{item.serverName}</Select.Option>)
+                            : getGameServerList?.data?.filter((item: { isSourceServer: any }) => (isIsMergeServer && ((!isMergeServer && item.isSourceServer) || (isMergeServer && !item.isSourceServer))) || !isIsMergeServer)?.map((item: any) => <Select.Option value={item.serverId} key={item.serverId}>{item.serverName}</Select.Option>)}
                     </Select>
                 </Form.Item></Col>}
 

src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/changeLog.tsx

@@ -1,6 +1,6 @@
 import { useAjax } from "@/Hook/useAjax"
 import { GetAssignUser, delAssignUserApi, getAssignUserApi } from "@/services/gameData/roleOperate"
-import { Button, Drawer, Input, Popconfirm, Select, Space, Table, Tag, message } from "antd"
+import { Drawer, Input, Select, Space, Table, Tag, message } from "antd"
 import React, { useEffect, useState } from "react"
 import { columnsChangeLog } from "./tableConfig"
 import { getRoleUserListApi } from "@/services/gameData"
@@ -125,7 +125,7 @@ const ChangeLog: React.FC<Props> = ({ data, visible, onClose, onChange }) => {
             dataSource={getAssignUser?.data?.records}
             columns={columnsChangeLog(update, del)}
             loading={getAssignUser.loading}
-            scroll={{ x: 380, y: 300 }}
+            scroll={{ x: 380, y: 600 }}
             className="uuTable"
             rowKey={'id'}
             pagination={

src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/tableConfig.tsx

@@ -537,7 +537,7 @@ export const columnsChangeLog = (update: (data: any) => void, del: (id: number[]
             ellipsis: true
         },
         {
-            title: '运营',
+            title: 'GS',
             dataIndex: 'gsName',
             key: 'gsName',
             width: 100,