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

无关风月

3 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

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

@@ -18,4 +18,5 @@
    private List<Integer> userIds;
    private Integer insertType;
    private Integer operatorId;
    private Integer storeId;
}