From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期五, 08 十二月 2023 17:18:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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