Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 3c12858927ce26f277ba758e520c81be599d8df1

 cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/ListQuery.java

@@ -21,5 +21,6 @@
    private Integer state;
    private Integer registerCondition;
    private List<Integer> ids;

    // 角色类型 如果是平台1的话 查询审核通过的 如果是运营商查询所有属于
    private Integer obj;
}