From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 11 四月 2025 20:24:10 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceQuery.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceQuery.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceQuery.java index 49bee23..1df2576 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceQuery.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceQuery.java @@ -16,6 +16,6 @@ // 活动状态 private Integer activityState; // 活动时间 - private String time; + private String time; } -- Gitblit v1.7.1