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

zxl

昨天 d33b041f4b2a63a22682c9b3f344ef35f84b4542

 framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeDrawQuery.java

@@ -18,5 +18,13 @@
@Data
@ApiModel(value = "PrizeDraw查询参数", description = "抽奖活动奖品查询参数")
public class PrizeDrawQuery extends AbsQuery {
    /**
     * 奖品名
     */
    private String prizeName;
    /**
     * 奖品类型
     */
    private String prizeType;
}