Merge remote-tracking branch 'origin/master'

doum

昨天 ed8eeb20e85871b44b5a0d51b96f5efa43d14d56

 server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/BaseActivity.java

@@ -57,7 +57,7 @@
    private Integer limitnum;

    @ApiModelProperty(value = "报名人数")
    private Integer applicantNum;
    private Long applicantNum;

    @ApiModelProperty(value = "活动价格（type为活动）")
    private BigDecimal price;