|  | @@ -55,21 +55,25 @@ function columns12() {
 | 
	
		
			
				|  |  |                      render: (a: string) => <Statistic value={a || 0} />
 | 
	
		
			
				|  |  |                  },
 | 
	
		
			
				|  |  |                  {
 | 
	
		
			
				|  |  | -                    title: '区服战力', dataIndex: 'server_combat_num', label: '区服信息', align: 'center', width: 90, default: 7,
 | 
	
		
			
				|  |  | +                    title: '区服攻击力', dataIndex: 'server_combat_num', label: '区服信息', align: 'right', width: 90, default: 7,
 | 
	
		
			
				|  |  |                      render: (a: string) => <Statistic value={a || 0} />
 | 
	
		
			
				|  |  |                  },
 | 
	
		
			
				|  |  |                  {
 | 
	
		
			
				|  |  | -                    title: '合服名称', dataIndex: 'boss_server_name', label: '区服信息', align: 'center', width: 70, default: 4,
 | 
	
		
			
				|  |  | -                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
 | 
	
		
			
				|  |  | -                },
 | 
	
		
			
				|  |  | -                {
 | 
	
		
			
				|  |  | -                    title: '合服ID', dataIndex: 'boss_server_id', label: '区服信息', align: 'center', width: 70,
 | 
	
		
			
				|  |  | -                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
 | 
	
		
			
				|  |  | -                },
 | 
	
		
			
				|  |  | -                {
 | 
	
		
			
				|  |  | -                    title: '合服时间', dataIndex: 'merge_time', label: '区服信息', align: 'center', width: 140,
 | 
	
		
			
				|  |  | +                    title: '合服列表名', dataIndex: 'son_server_ids_name', label: '区服信息', align: 'center', width: 90, default: 4,
 | 
	
		
			
				|  |  |                      render: (a: string, b: any) => (<WidthEllipsis value={a} />)
 | 
	
		
			
				|  |  |                  },
 | 
	
		
			
				|  |  | +                // {
 | 
	
		
			
				|  |  | +                //     title: '合服名称', dataIndex: 'boss_server_name', label: '区服信息', align: 'center', width: 70,
 | 
	
		
			
				|  |  | +                //     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
 | 
	
		
			
				|  |  | +                // },
 | 
	
		
			
				|  |  | +                // {
 | 
	
		
			
				|  |  | +                //     title: '合服ID', dataIndex: 'boss_server_id', label: '区服信息', align: 'center', width: 70,
 | 
	
		
			
				|  |  | +                //     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
 | 
	
		
			
				|  |  | +                // },
 | 
	
		
			
				|  |  | +                // {
 | 
	
		
			
				|  |  | +                //     title: '合服时间', dataIndex: 'merge_time', label: '区服信息', align: 'center', width: 140,
 | 
	
		
			
				|  |  | +                //     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
 | 
	
		
			
				|  |  | +                // },
 | 
	
		
			
				|  |  |                  {
 | 
	
		
			
				|  |  |                      title: '合服次数', dataIndex: 'sum_server_count', label: '区服信息', align: 'center', width: 60, 
 | 
	
		
			
				|  |  |                      render: (a: string) => <Statistic value={a || 0} />
 | 
	
	
		
			
				|  | @@ -233,6 +237,7 @@ function columns12() {
 | 
	
		
			
				|  |  |                              dataIndex: 'combat_num',
 | 
	
		
			
				|  |  |                              key: 'combat_num',
 | 
	
		
			
				|  |  |                              width: 95,
 | 
	
		
			
				|  |  | +                            align: 'right',
 | 
	
		
			
				|  |  |                              className: "h5BiomassClass green2ColorClass",
 | 
	
		
			
				|  |  |                              render: (a: any, b: any) => {
 | 
	
		
			
				|  |  |                                  return <div className='h5BiomassTable'>
 |