Merge remote-tracking branch 'origin/master'

This commit is contained in:
gaowdong 2025-05-09 14:06:17 +08:00
commit 3a799fd7c1
1 changed files with 20 additions and 18 deletions

View File

@ -143,26 +143,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReserveMealCanteenList" resultMap="appletReserveCanteenVO"> <select id="selectReserveMealCanteenList" resultMap="appletReserveCanteenVO">
select select
ac.canteen_id, ac.canteen_id,
ac.canteen_name, ac.canteen_name,
ac.img_url as canteen_img_url, ac.img_url as canteen_img_url,
ass.stall_id, ass.stall_id,
ass.stall_name, ass.stall_name,
ass.img_url as stall_img_url, ass.img_url as stall_img_url,
mr.recipe_id, mr.recipe_id,
ac.start_business_time as start_business_time_ac, ac.start_business_time as start_business_time_ac,
ac.end_business_time as end_business_time_ac, ac.end_business_time as end_business_time_ac,
ac.business_state as business_state_ac, ac.business_state as business_state_ac,
ass.start_business_time, ass.start_business_time,
ass.end_business_time, ass.end_business_time,
ass.business_state ass.business_state
from from
menu_app_recipe mar alloc_canteen ac
left join menu_recipe mr on mar.recipe_id = mr.recipe_id left join alloc_stall ass on ac.canteen_id = ass.canteen_id
left join alloc_canteen ac on mr.canteen_id = ac.canteen_id left join menu_recipe mr on mr.stall_id = ass.stall_id
left join alloc_stall ass on mr.stall_id = ass.stall_id left join menu_app_recipe mar on mar.recipe_id = mr.recipe_id
where where
bind_type = 2 bind_type = 2
and ac.del_flag = 0
and ass.del_flag = 0
</select> </select>
<select id="selectMonthSalesStall" resultType="com.bonus.canteen.core.alloc.domain.MenuStallSaleModel"> <select id="selectMonthSalesStall" resultType="com.bonus.canteen.core.alloc.domain.MenuStallSaleModel">