--no commit message

com.zrqx.talk/src/main/java/com/zrqx/talk/bg/controller/TalkController.java

@@ -70,8 +70,20 @@ public class TalkController {
 	@ApiOperation(value = "获取热帖列表", notes = "获取热帖列表")
 	@GetMapping(value = TalkRequestPath.LIST)
 	public CallBack<PageInfo<TalkListVO>> queryTalkList(QueryTalkForm entity, PageParam pageParam) {
+		if (entity != null && StringUtils.isNotEmpty(entity.getEndTime())){
+			entity.setEndTime(entity.getEndTime() + " 23:59:59");
+		}
 		return CallBack.success(talkService.queryTalkList(entity, pageParam));
 	}
+	
+	@ApiOperation(value = "获取全部热帖列表", notes = "获取全部热帖列表")
+	@GetMapping(value = TalkRequestPath.TALK + TalkRequestPath.LIST)
+	public CallBack<PageInfo<TalkListVO>> talkList(QueryTalkForm entity, PageParam pageParam) {
+		if (entity != null && StringUtils.isNotEmpty(entity.getEndTime())){
+			entity.setEndTime(entity.getEndTime() + " 23:59:59");
+		}
+		return CallBack.success(talkService.queryList(entity, pageParam));
+	}
 
 	@ApiOperation(value = "删除主题", notes = "批量删除主题")
 	@PostMapping(value = TalkRequestPath.BATCH_DELETE)