Merge remote-tracking branch 'origin/master'

This commit is contained in:
liyawei
2022-03-03 11:59:58 +08:00
@@ -267,7 +267,7 @@ public class SysAnnouncementSendController {
*/ */
@GetMapping(value = "/getMessageUnreadList") @GetMapping(value = "/getMessageUnreadList")
public Result<?> getMessageUnreadList() { public Result<?> getMessageUnreadList() {
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>(); Result<AnnouncementSendModel> result = new Result<AnnouncementSendModel>();
List<AnnouncementSendModel> messageUnreadList = sysAnnouncementSendService.getMessageUnreadList(); List<AnnouncementSendModel> messageUnreadList = sysAnnouncementSendService.getMessageUnreadList();
result.OK(messageUnreadList); result.OK(messageUnreadList);
return result; return result;