From 11f6d2627ce8eb37c6460892509460b0e19e5656 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 22 二月 2024 17:00:06 +0800 Subject: [PATCH] Merge branch '1.0-bug' of http://120.76.84.145:10101/gitblit/r/java/PlayPai 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