From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +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