Merge branch 'send_coupon' into user_action

peng

1 天以前 e4dd7447aaa4563b9e64a7556710677a140776eb

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

@@ -33,5 +33,9 @@
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    public Date endTime;

    private String enableStatus;

    private Boolean popup;
}