fix merge error

Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs

@@ -52,23 +52,7 @@ public class DishesMenusController : ControllerBase
         return await _dishesMenuService.GetDishesMenuDetailAsync(businessPlaceCode, customCode, startDate, endDate);
     }
 
-    /// <summary>
-    /// 根据参数获取菜品
-    /// </summary>
-    /// <param name="businessPlaceCode"></param>
-    /// <param name="date"></param>
-    /// <param name="shiftType"></param>
-    /// <param name="categoryCode"></param>
-    /// <returns></returns>
-    [HttpGet("dishes-selections")]
-    [IgnoreTenant]
-    public async Task<List<DishesDetailResponse>> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode,
-        DateTime date,
-        ShiftEnumType? shiftType,
-        Guid categoryCode)
-    {
-        return await _dishesMenuService.GetDishesUnderCurrentMenuAsync(businessPlaceCode, date, shiftType, categoryCode);
-    }
+
 
     /// <summary>
     /// 根据参数获取菜品