Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

3 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 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;
}