Merge remote-tracking branch 'origin/master'

rk

昨天 511ce651667f5b2284247cc60599078b86f7963f

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
package com.doumee.dao.web.dto.activity;
 
import com.doumee.dao.web.dto.shop.ShopSimpleDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
 
@Data
@ApiModel("商家活动基础信息")
public class ShopActivity extends BaseActivity{
 
    @ApiModelProperty(value = "商户信息")
    private ShopSimpleDTO shopSimpleDTO;
 
}