From 54e30e692502b22c10e028f7e658ea0cfafcc9ba Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 15 May 2025 19:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DatascreenController.java      |  2 +-
 .../report/datascreen/dto/DatascreenDTO.java  | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/controller/DatascreenController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/controller/DatascreenController.java
index 431c1963..6650e2c2 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/controller/DatascreenController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/controller/DatascreenController.java
@@ -67,7 +67,7 @@ public class DatascreenController {
 //      }
 
       DsAuthorityCanteenVO dsAuthorityCanteenVO = new DsAuthorityCanteenVO();
-      dsAuthorityCanteenVO.setCanteenId(378928314946949120L);
+      dsAuthorityCanteenVO.setCanteenId(dto.getCanteenId());
       canteenList.add(dsAuthorityCanteenVO);
       return AjaxResult.success(this.datascreenService.getCurrentMealtimeNum(canteenList));
    }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/dto/DatascreenDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/dto/DatascreenDTO.java
index 3985ecfa..bb50082a 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/dto/DatascreenDTO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/dto/DatascreenDTO.java
@@ -2,28 +2,17 @@ package com.bonus.canteen.core.report.datascreen.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 @ApiModel
+@Data
 public class DatascreenDTO {
    @ApiModelProperty("权限id")
    private String authorityId;
    @ApiModelProperty("数据模块对应key")
    private String key;
 
-   public String getAuthorityId() {
-      return this.authorityId;
-   }
-
-   public String getKey() {
-      return this.key;
-   }
-
-   public void setAuthorityId(final String authorityId) {
-      this.authorityId = authorityId;
-   }
-
-   public void setKey(final String key) {
-      this.key = key;
-   }
+   @ApiModelProperty("食堂id")
+   private Long canteenId;
 
 }