Merge branch 'dev' into user_action

peng

2025-10-17 a60e866f9d30de8ed50d3cd01c3979dfccb6d94b

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