Code

merge: conflict problem#153

Code

Merged

LEEJaeHyeok97 merged 80 commits into9oormthon-univ:develop9oormthon-univ/2024_DANPOONG_TEAM_5_BE:developfrom LEEJaeHyeok97:developLEEJaeHyeok97/2024_DANPOONG_TEAM_5_BE:developCopy head branch name to clipboardNov 25, 2024

+1-1

Commits

Commits on Nov 19, 2024

• feat: 장바구니 추가 기능 구현

  LEEJaeHyeok97

  committed
  754b1c0

  Copy full SHA for 754b1c0

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  9c2f259

  Copy full SHA for 9c2f259

• feat: 장바구니 조회 기능 구현

  LEEJaeHyeok97

  committed
  b5de2ba

  Copy full SHA for b5de2ba

• Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPOONG_TEAM_5_BE into develop

  LEEJaeHyeok97

  committed
  ca6b405

  Copy full SHA for ca6b405

• Merge branch 'develop' into develop

  LEEJaeHyeok97

  authored
  5b563b5

  Copy full SHA for 5b563b5

• feat: 상품 주문과 식권 사용 기능 구현

  LEEJaeHyeok97

  committed
  b4dbfe4

  Copy full SHA for b4dbfe4

• Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPOONG_TEAM_5_BE into develop

  LEEJaeHyeok97

  committed
  fc50cd6

  Copy full SHA for fc50cd6

• Merge branch 'develop' into develop

  LEEJaeHyeok97

  authored
  d97a8de

  Copy full SHA for d97a8de

• style: 포인트트랜잭션 레포지토리명 변경

  LEEJaeHyeok97

  committed
  74c8af5

  Copy full SHA for 74c8af5

• Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPOONG_TEAM_5_BE into develop

  LEEJaeHyeok97

  committed
  25cb8d0

  Copy full SHA for 25cb8d0

• Merge branch 'develop' into develop

  LEEJaeHyeok97

  authored
  4b89797

  Copy full SHA for 4b89797

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  5976f75

  Copy full SHA for 5976f75

• deploy: 재배포

  LEEJaeHyeok97

  committed
  eae3903

  Copy full SHA for eae3903

• deploy: 재배포2

  LEEJaeHyeok97

  committed
  7e1ada5

  Copy full SHA for 7e1ada5

Commits on Nov 20, 2024

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  ca608fb

  Copy full SHA for ca608fb

• deploy: 로그인 로직 수정에 따른 재배포

  LEEJaeHyeok97

  committed
  63413e0

  Copy full SHA for 63413e0

• deploy: 로그인 로직 수정에 따른 재배포2

  LEEJaeHyeok97

  committed
  e20a015

  Copy full SHA for e20a015

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  c627cc2

  Copy full SHA for c627cc2

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  9829a4b

  Copy full SHA for 9829a4b

• feat: 식권 사용 기능 구현

  LEEJaeHyeok97

  committed
  2f66ad9

  Copy full SHA for 2f66ad9

• feat: yml 수정 사항 반영

  LEEJaeHyeok97

  committed
  163d698

  Copy full SHA for 163d698

• feat: 식권 사용 로직 수정

  LEEJaeHyeok97

  committed
  3de7376

  Copy full SHA for 3de7376

• Merge branch 'develop' into develop

  LEEJaeHyeok97

  authored
  ccc6df3

  Copy full SHA for ccc6df3

• feat: 주문 로직 수정 완료

  LEEJaeHyeok97

  committed
  f791988

  Copy full SHA for f791988

• Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPOONG_TEAM_5_BE into develop

  LEEJaeHyeok97

  committed
  36965a7

  Copy full SHA for 36965a7

• fix: 장바구니에 아무것도 없을 때 주문 시 active 되는 현상 수정

  LEEJaeHyeok97

  committed
  6bc0d02

  Copy full SHA for 6bc0d02

• feat: 주문 완료 시 리턴 값 수정

  LEEJaeHyeok97

  committed
  7ae17ee

  Copy full SHA for 7ae17ee

• Merge branch 'develop' into develop

  LEEJaeHyeok97

  authored
  9ca3a35

  Copy full SHA for 9ca3a35

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  2ffe327

  Copy full SHA for 2ffe327

• feat: 내 그룹 조회 기능 구현

  LEEJaeHyeok97

  committed
  e82f58c

  Copy full SHA for e82f58c

• feat: 기본 프로필 이미지 url 추가

  LEEJaeHyeok97

  committed
  a98d6f0

  Copy full SHA for a98d6f0

• Merge branch 'develop' into develop

  LEEJaeHyeok97

  authored
  9376ed6

  Copy full SHA for 9376ed6

Commits on Nov 21, 2024

• feat: 그룹 멤버 전체 조회 기능 구현

  LEEJaeHyeok97

  committed
  4c73bf5

  Copy full SHA for 4c73bf5

• Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPOONG_TEAM_5_BE into develop

  LEEJaeHyeok97

  committed
  125752b

  Copy full SHA for 125752b

• Merge branch 'develop' into develop

  LEEJaeHyeok97

  authored
  9f89029

  Copy full SHA for 9f89029

• feat: 1인당 사용 가능 금액 설정 컬럼 추가

  LEEJaeHyeok97

  committed
  32836c3

  Copy full SHA for 32836c3

• Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPOONG_TEAM_5_BE into develop

  LEEJaeHyeok97

  committed
  ca2a8dc

  Copy full SHA for ca2a8dc

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  16c56a3

  Copy full SHA for 16c56a3

• feat: 내 지갑 조회 기능 구현

  LEEJaeHyeok97

  committed
  f30aa7c

  Copy full SHA for f30aa7c

• Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPOONG_TEAM_5_BE into develop

  LEEJaeHyeok97

  committed
  5ec891e

  Copy full SHA for 5ec891e

• feat: 선결제 기능 구현

  LEEJaeHyeok97

  committed
  44827ce

  Copy full SHA for 44827ce

• feat: 유저 홈 화면 조회 기능 구현

  LEEJaeHyeok97

  committed
  74ca8b0

  Copy full SHA for 74ca8b0

• Merge branch 'develop' into develop

  LEEJaeHyeok97

  authored
  dc09775

  Copy full SHA for dc09775

Commits on Nov 22, 2024

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  2864139

  Copy full SHA for 2864139

• feat: 그룹 상세 조회 기능 구현

  LEEJaeHyeok97

  committed
  aef871a

  Copy full SHA for aef871a

Commits on Nov 23, 2024

• feat: 가게 상세 조회 쿼리 수정

  LEEJaeHyeok97

  committed
  f19e93f

  Copy full SHA for f19e93f

• Merge branch 'develop' into develop

  LEEJaeHyeok97

  authored
  d15f3a2

  Copy full SHA for d15f3a2

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  6109e9f

  Copy full SHA for 6109e9f

• deploy: 변경사항 반영을 위한 커밋

  LEEJaeHyeok97

  committed
  47e29b4

  Copy full SHA for 47e29b4

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  90ba864

  Copy full SHA for 90ba864

• deploy: 수정 사항 반영 재배포

  LEEJaeHyeok97

  committed
  9400ff1

  Copy full SHA for 9400ff1

• deploy: rds 교체로 인한 재배포

  LEEJaeHyeok97

  committed
  8609c35

  Copy full SHA for 8609c35

• deploy: rds 교체로 인한 재배포2

  LEEJaeHyeok97

  committed
  3e79389

  Copy full SHA for 3e79389

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  8e7a2a5

  Copy full SHA for 8e7a2a5

• feat: 홈 화면 소속팀 조회 쿼리 제대로 안되던 현상 해결, 대표이미지 반환 추가

  LEEJaeHyeok97

  committed
  6aea111

  Copy full SHA for 6aea111

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  ab8d7d2

  Copy full SHA for ab8d7d2

• feat: 그룹 상세 조회 응답 컬럼명 변경

  LEEJaeHyeok97

  committed
  a53ef21

  Copy full SHA for a53ef21

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  f4b31c2

  Copy full SHA for f4b31c2

• feat: memberLimit 컬럼 삭제

  LEEJaeHyeok97

  committed
  83c7f69

  Copy full SHA for 83c7f69

• feat: 선결제 시 기존 결제 내역과 멱등성 문제 해결

  LEEJaeHyeok97

  committed
  25be727

  Copy full SHA for 25be727

• fix: 팀 상세 조회 시 이미지 쿼리가 의미 없이 join 되던 쿼리 수정

  LEEJaeHyeok97

  committed
  afdbfbe

  Copy full SHA for afdbfbe

• feat: 가게 검색 기능 대폭 수정

  LEEJaeHyeok97

  committed
  1f65811

  Copy full SHA for 1f65811

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  08f03f7

  Copy full SHA for 08f03f7

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  530ca13

  Copy full SHA for 530ca13

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  5a674fb

  Copy full SHA for 5a674fb

• feat: 프론트 요구사 반영

  LEEJaeHyeok97

  committed
  aae5ff4

  Copy full SHA for aae5ff4

• :wq

  Show description for f2ec318
  LEEJaeHyeok97

  committed
  f2ec318

  Copy full SHA for f2ec318

• feat: searchcondition 삭제

  LEEJaeHyeok97

  committed
  47de53b

  Copy full SHA for 47de53b

• feat: 팀타입 desription 리턴 하도록 수정

  LEEJaeHyeok97

  committed
  1ca86f0

  Copy full SHA for 1ca86f0

• feat: 카테고리별 팀 조회 시 팀 생성일 컬럼 추가

  LEEJaeHyeok97

  committed
  713efe9

  Copy full SHA for 713efe9

• Merge branch 'develop' into develop

  LEEJaeHyeok97

  authored
  ef61b17

  Copy full SHA for ef61b17

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  dcfa727

  Copy full SHA for dcfa727

• Merge branch '9oormthon-univ:develop' into develop

  LEEJaeHyeok97

  authored
  4c7bd3c

  Copy full SHA for 4c7bd3c

• feat: 매장찾기_상세 페이지 조회 기능 구현

  LEEJaeHyeok97

  committed
  7f1f36e

  Copy full SHA for 7f1f36e

• Merge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPOONG_TEAM_5_BE into develop

  LEEJaeHyeok97

  committed
  906596b

  Copy full SHA for 906596b

• feat: 비밀 코드 조회 기능 엔드 포인트 수정

  LEEJaeHyeok97

  committed
  d874384

  Copy full SHA for d874384

• fix: conflict fix

  LEEJaeHyeok97

  committed
  fb598b8

  Copy full SHA for fb598b8

Commits on Nov 25, 2024

• hotfix: 서버 복구

  LEEJaeHyeok97

  committed
  1caba7e

  Copy full SHA for 1caba7e

• hotfix: 서버 복구2

  LEEJaeHyeok97

  committed
  eacfa91

  Copy full SHA for eacfa91

• Merge branch 'develop' into develop

  LEEJaeHyeok97

  authored
  4204711

  Copy full SHA for 4204711