diff --git a/sky-server/src/main/java/com/sky/controller/user/UserCategoryController.java b/sky-server/src/main/java/com/sky/controller/user/UserCategoryController.java
index 141e6a9..ebc9de4 100644
--- a/sky-server/src/main/java/com/sky/controller/user/UserCategoryController.java
+++ b/sky-server/src/main/java/com/sky/controller/user/UserCategoryController.java
@@ -4,6 +4,7 @@ import com.sky.entity.Category;
 import com.sky.result.Result;
 import com.sky.service.CategoryService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,6 +23,7 @@ public class UserCategoryController {
     private CategoryService categoryService;
 
     @GetMapping("/list")
+    @ApiOperation("category list")
     public Result<List<Category>> list(Integer type){
         log.info("user category list: {}",type);
         List<Category> list = categoryService.list(type);
diff --git a/sky-server/src/main/java/com/sky/controller/user/UserSetmealController.java b/sky-server/src/main/java/com/sky/controller/user/UserSetmealController.java
index 09ca19e..5cedbc6 100644
--- a/sky-server/src/main/java/com/sky/controller/user/UserSetmealController.java
+++ b/sky-server/src/main/java/com/sky/controller/user/UserSetmealController.java
@@ -1,6 +1,41 @@
 package com.sky.controller.user;
 
 
-public class UserSetmealController {
+import com.sky.entity.Setmeal;
+import com.sky.result.Result;
+import com.sky.service.SetmealService;
+import com.sky.vo.DishItemVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
+@RestController
+@RequestMapping("/user/setmeal")
+@Api(tags = "UserSetmeal")
+@Slf4j
+public class UserSetmealController {
+    @Autowired
+    private SetmealService setmealService;
+
+    @GetMapping("/list")
+    @ApiOperation("select setmeal by categoryId")
+    public Result<List<Setmeal>> list(Integer categoryId){
+        log.info("select setmeal by categoryId :{}", categoryId);
+        List<Setmeal> setmealList = setmealService.selectSetmealByCategoryId(categoryId);
+        return Result.success(setmealList);
+    }
+
+    @GetMapping("/dish/{id}")
+    @ApiOperation("select dishes by setmealId")
+    public Result<List<DishItemVO>> getDishBySetmealId(@PathVariable Long id){
+        log.info("select dishes by setmealId :{}", id);
+        return Result.success(setmealService.getDishBySetmealId(id));
+    }
 }
diff --git a/sky-server/src/main/java/com/sky/mapper/DishMapper.java b/sky-server/src/main/java/com/sky/mapper/DishMapper.java
index 7c1f083..a09f73e 100644
--- a/sky-server/src/main/java/com/sky/mapper/DishMapper.java
+++ b/sky-server/src/main/java/com/sky/mapper/DishMapper.java
@@ -5,6 +5,8 @@ import com.sky.annotation.AutoFill;
 import com.sky.dto.DishPageQueryDTO;
 import com.sky.entity.Dish;
 import com.sky.enumeration.OperationType;
+import com.sky.result.Result;
+import com.sky.vo.DishItemVO;
 import com.sky.vo.DishVO;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -70,4 +72,6 @@ public interface DishMapper {
     List<Dish> selectByCategoryId(Long categoryId);
 
     List<Dish> selectByDishIdsAndStatusDisable(List<Long> dishIds);
+
+    List<DishItemVO> selectDishBySetmealId(Long id);
 }
diff --git a/sky-server/src/main/java/com/sky/mapper/SetmealMapper.java b/sky-server/src/main/java/com/sky/mapper/SetmealMapper.java
index d808e47..fb9f131 100644
--- a/sky-server/src/main/java/com/sky/mapper/SetmealMapper.java
+++ b/sky-server/src/main/java/com/sky/mapper/SetmealMapper.java
@@ -33,4 +33,7 @@ public interface SetmealMapper {
 
     @AutoFill(OperationType.UPDATE)
     void update(Setmeal setmeal);
+
+    @Select("select * from setmeal where category_id = #{categoryId}")
+    List<Setmeal> selectByCategoryId(Integer categoryId);
 }
diff --git a/sky-server/src/main/java/com/sky/service/SetmealService.java b/sky-server/src/main/java/com/sky/service/SetmealService.java
index 5e736bd..b733cfc 100644
--- a/sky-server/src/main/java/com/sky/service/SetmealService.java
+++ b/sky-server/src/main/java/com/sky/service/SetmealService.java
@@ -2,7 +2,10 @@ package com.sky.service;
 
 import com.sky.dto.SetmealDTO;
 import com.sky.dto.SetmealPageQueryDTO;
+import com.sky.entity.Setmeal;
 import com.sky.result.PageResult;
+import com.sky.result.Result;
+import com.sky.vo.DishItemVO;
 import com.sky.vo.SetmealVO;
 import org.springframework.stereotype.Service;
 
@@ -48,4 +51,8 @@ public interface SetmealService {
      * @param id
      */
     void startOrStop(Integer status, Long id);
+
+    List<Setmeal> selectSetmealByCategoryId(Integer categoryId);
+
+    List<DishItemVO> getDishBySetmealId(Long id);
 }
diff --git a/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java
index 232f933..92bf3ba 100644
--- a/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java
+++ b/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java
@@ -14,7 +14,9 @@ import com.sky.mapper.DishMapper;
 import com.sky.mapper.SetmealDishMapper;
 import com.sky.mapper.SetmealMapper;
 import com.sky.result.PageResult;
+import com.sky.result.Result;
 import com.sky.service.SetmealService;
+import com.sky.vo.DishItemVO;
 import com.sky.vo.SetmealVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -164,4 +166,14 @@ public class SetmealServiceImpl implements SetmealService {
         setmealMapper.update(setmeal);
 
     }
+
+    @Override
+    public List<Setmeal> selectSetmealByCategoryId(Integer categoryId) {
+        return setmealMapper.selectByCategoryId(categoryId);
+    }
+
+    @Override
+    public List<DishItemVO> getDishBySetmealId(Long id) {
+        return dishMapper.selectDishBySetmealId(id);
+    }
 }
diff --git a/sky-server/src/main/resources/mapper/DishMapper.xml b/sky-server/src/main/resources/mapper/DishMapper.xml
index c19a698..31edbf3 100644
--- a/sky-server/src/main/resources/mapper/DishMapper.xml
+++ b/sky-server/src/main/resources/mapper/DishMapper.xml
@@ -55,4 +55,10 @@
         </foreach>
         and status = 0
     </select>
+    <select id="selectDishBySetmealId" resultType="com.sky.vo.DishItemVO">
+        select copies,description,image,d.name
+        from sky_take_out.setmeal_dish s
+                 join dish d on d.id = s.dish_id
+        where s.setmeal_id = #{id}
+    </select>
 </mapper>
\ No newline at end of file