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

无关风月

3 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

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

@@ -71,7 +71,7 @@
    @ApiModelProperty("是否需要实名（0=否，1=是）")
    private Integer isReal;
    @ApiModelProperty("门店信息")
    private List<Map<String,Object>> storeInfos;
    private List<Map<String, Object>> storeInfos;

    @ApiModelProperty("是否已过报名时间0否，1是")
    private Integer hasPass;