Skip to content

Commit

Permalink
Merge pull request #100 from Tea-Bliss/dev
Browse files Browse the repository at this point in the history
Main PR
  • Loading branch information
mun9659 authored Jun 24, 2024
2 parents 95ae409 + 7b64c71 commit 66b4eeb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/main/resources/mapper/IngredientMapper.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
i.sale_status,
i.flavor,
i.explanation,
i.photo,
i.create_dt,
i.update_dt
FROM INGREDIENT i
Expand All @@ -33,6 +34,7 @@
sale_status,
flavor,
explanation,
photo,
create_dt,
update_dt
FROM INGREDIENT
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mapper/MemberMapper.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
mem.create_dt,
mem.update_dt
FROM MEMBER mem
INNER JOIN REVIEW re
LEFT OUTER JOIN REVIEW re
ON mem.mem_id = re.mem_id
<if test="email != null and email != ''">
AND mem.email = #{email}
Expand Down

0 comments on commit 66b4eeb

Please sign in to comment.