From 167db6096c4c835b3c539a02834f6066d0322cdd Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 12 Mar 2025 14:24:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java     | 2 ++
 .../canteen/service/impl/CanteenDailyMenuServiceImpl.java       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java
index 70ed64b1c..e8ffe0722 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/app/DailyMenuAppVO.java
@@ -38,4 +38,6 @@ public class DailyMenuAppVO {
      * 时间类型
      */
     private Integer hourType;
+
+    private Integer sort;
 }
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
index cb74c31e2..9d0e67912 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
@@ -168,11 +168,13 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl<CanteenDailyMenuMap
                             vo.setPrice(spuEntity.getPrice());
                             vo.setPicUrl(spuEntity.getPicUrl());
                             vo.setName(spuEntity.getName());
+                            vo.setSort(spuEntity.getSort());
                             // 其他需要的字段
                         }
                         return vo;
                     })
                     .collect(Collectors.toList());
+            dailyMenuVOList.sort(Comparator.comparing(DailyMenuAppVO::getSort));
             pageData.setRecords(dailyMenuVOList);
             return pageData;
         }