From 4fca12e02f0d2444d83c6316ba63b249cd0e8505 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 20 Apr 2024 10:05:36 +0800
Subject: [PATCH] 议事问题优化

---
 src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
index b46a73f..f07bb6b 100644
--- a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
@@ -117,7 +117,7 @@
 		PublicDiscussEntity discussEntity = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getArticleId, topicsList.get(0).getArticleId()));
 		// 判断是否在开始和结束时间内
 		if (discussEntity.getStartTime().getTime() > System.currentTimeMillis() || discussEntity.getEndTime().getTime() < System.currentTimeMillis()) {
-			return "目前不在投票时间内,投票时间:"+ DateUtil.formatDateTime(discussEntity.getStartTime()) +"-"+DateUtil.formatDateTime(discussEntity.getEndTime());
+			return "目前不在投票时间内,投票时间:"+ DateUtil.formatDateTime(discussEntity.getStartTime()) +" 至 "+DateUtil.formatDateTime(discussEntity.getEndTime());
 		}
 		if (StringUtils.isNotBlank(topics.getPhone())) {
 			if (StringUtils.isBlank(topics.getCode())) {

--
Gitblit v1.9.3