Merge branch 'dev' into 'mp-server-test'

营销活动列表增加参与人数

See merge request quanshu/mp-server!632

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserMarketingListVO.java

@@ -26,6 +26,9 @@ public class UserMarketingListVO {
     @ApiModelProperty("活动主图")
     private String picUrl;
 
+    @ApiModelProperty("参与人数")
+    private Integer fakeNum;
+
     @ApiModelProperty("开始时间")
     private Date startTime;