fix

src/components/QueryForm/index.tsx

@@ -67,6 +67,8 @@ interface Props {
     isSuperParentGameId?: boolean
     /** 是否开启 是否合服 搜索 */
     isIsMergeServer?: boolean
+    /** 是否开启 是否参与过合服 搜索 */
+    isIsParticipateMerge?: boolean
     /** 是否开启 游戏应用类型 搜索 */
     isGameType?: boolean
     /** 是否开启 游戏角色名 搜索 */
@@ -264,7 +266,7 @@ const QueryForm: React.FC<Props> = (props) => {
         isGameRoleName, isFirstRecharge, isSwitch, isMerchantNo, isOrderId, isMerchantOrderNo, isPayStatus, isPayWay, isProductName, isRegAgent, isAgentId, isPutAgent, isRegDay, isOs, isParentId, isParentIds, isProjectId, isProjectName, isPromotionId, isPromotionId1, isPromotionName,
         isSysUserName, isRechargeDate, isBGGameClassify, isGameUserId, isSysUserId, isSysUserIds, isUserName, isUserId, isSelectRanking, isGameType, isConsumeDay, rechargeDay, isBeginDay, isType, isAdTTStatus, isUserEnterType, isServerName, isServerId, isServerDay, isAdTXStatus,
         payTimeDay, placeAnOrderDay, isPayIntervalTime, isActiveTypes, isNickname, isMobile, isRegIp, isIsAuth, isIsBindMobile, isIsRecharge, isUserStatus, isCreateRole, isRoleCount, isVipLevel, isCreateRoleDay, isLastActiveTime, isIsChange, isIsSendMail, isWeChatCompany, isWeChat,
-        isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isSuperParentGameId, isGameServerName, isIp, isDeviceType, isLoginType, isServerIdUn, isSourceServerName, isProjectId1, isRemoveGame, isRemoveGameForSystem, isOrderLy, isAddCorpWechat,
+        isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isIsParticipateMerge, isSuperParentGameId, isGameServerName, isIp, isDeviceType, isLoginType, isServerIdUn, isSourceServerName, isProjectId1, isRemoveGame, isRemoveGameForSystem, isOrderLy, isAddCorpWechat,
         isWakeUp, isBackStatus, isGameDimension, isUserLastRegTime, isUserLastRegAgentId, isUserLastPitcherId, isRechargeAmountWithin24h, isRechargeTotalAmountWithin24h
     } = props
     const [form] = Form.useForm()
@@ -980,6 +982,11 @@ const QueryForm: React.FC<Props> = (props) => {
                 </Form.Item></Col>}
             </>}
 
+            {/* 是否参与过合服 */}
+            {isIsParticipateMerge && <Col><Form.Item name='isParticipateMerge' valuePropName="checked">
+                <Checkbox>是否参与过合服</Checkbox>
+            </Form.Item></Col>}
+
             {/* 游戏应用类型搜索 */}
             {isGameType && <Col><Form.Item name='gameType'>
                 <Select

src/pages/gameDataStatistics/roleOperate/roleFightingRanking/index.tsx

@@ -51,6 +51,7 @@ const RoleFightingRanking: React.FC = () => {
                 isSuperParentGameId
                 // isParentId
                 isIsMergeServer
+                isIsParticipateMerge
                 isServerIds
                 isGameServerName
                 isRankingNum