Merge branch 'dev' of GameCenter/game-center into master

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -936,7 +936,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 dto.setSortFiled("roleUserIpCount");
             }
             if(dto.getSortFiled().equals("roleUserIpCountFilter")){
-                dto.setSortFiled("roleCountGroupFiltersCount");
+                dto.setSortFiled("roleUserIpCountFilter");
             }
             criA.getOrderBy().orderBy(dto.getSortFiled(), dto.getSortType());
         }