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

zxl

昨天 c4786844ef75025cd27cc3833a0f7cd86ad80781

 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;
}