Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #329

Open
wants to merge 659 commits into
base: main
Choose a base branch
from
Open

Dev #329

wants to merge 659 commits into from

Conversation

CessnaJ
Copy link
Contributor

@CessnaJ CessnaJ commented Apr 19, 2024

MR 이유

  • Feature 병합
  • 버그 수정(아래에 상세 기입)
  • 코드 스타일 변경 (formatting, local variables ex> indentation 변경, 변수명 변경, 주석 추가 )
  • 리팩터링 (로직변경 X, api 변경 X, ex> 함수 분리, 클래스 재구조화 )
  • 주기적인 master 병합
  • Build 관련 변경
  • CI 관련 변경
  • Docs 관련 변경
  • 기타(아래에 상세 기입)

스크린샷 또는 세부 내용

  • 세부사항을 항목으로 설명

MR 전 확인

  • 정상 작동
  • Conflict 발생 - 팀원과의 상의 필요

ssjy4974 and others added 30 commits November 1, 2023 15:44
@ssjy4974
Merge pull request #245 from lotteon2/feat/fe/product
282791c 
add : 바로 구매하기 성공 시 라우터 추가
@ssjy4974
add : 바로 구매하기 console log 추가
c06a1cc
@ssjy4974
Merge pull request #246 from lotteon2/feat/fe/product
c5b8694 
add : 바로 구매하기 console log 추가
@ssjy4974
fix : 바로구매하기 수정
4a7ce12
@ssjy4974
Merge pull request #247 from lotteon2/feat/fe/product
4cc3fe8 
fix : 바로구매하기 수정
@ssjy4974
fix : ordersheetInfos 수정
fe429e1
@ssjy4974
Merge pull request #248 from lotteon2/feat/fe/product
7907f7d 
fix : ordersheetInfos 수정
@ssjy4974
fix : 바로구매주문시 stock 수정
740c7e0
@ssjy4974
Merge pull request #249 from lotteon2/feat/fe/product
31fa9ec 
fix : 바로구매주문시 stock 수정
@ssjy4974
add : addOrderSheet 콘솔 확인
5c917f4
@ssjy4974
Merge pull request #250 from lotteon2/feat/fe/product
5f21816 
add : addOrderSheet 콘솔 확인
@ssjy4974
add : orderSheetItems 추가
81b12c6
@ssjy4974
Merge pull request #251 from lotteon2/feat/fe/product
2218bdb 
add : orderSheetItems 추가
@CessnaJ
✨Feat: 주문서에 결제금액 나오도록 처리
10a92f2
@CessnaJ
Merge pull request #252 from lotteon2/hotfix/front/ordersheet
f63cfe3 
✨Feat: 주문서에 결제금액 나오도록 처리
@ssjy4974
add : 관리자 로그인 리다이렉트, 로그인 하지 않은 유저 방어 로직 추가
ae01685
@ssjy4974
Merge pull request #253 from lotteon2/feat/fe/product
a50de88 
add : 관리자 로그인 리다이렉트, 로그인 하지 않은 유저 방어 로직 추가
@qwerty1434
Merge pull request #254 from lotteon2/order-service
3e1fe8e 
✨ Faet : 주문에 주소 추가
@qwerty1434
✨ Faet : 주문에 주소 추가
3f8ab84
@CessnaJ
❤CI/CD: admin 재빌드
b2d534e
@CessnaJ
Merge pull request #255 from lotteon2/hotfix/front/ordersheet
e6aa5c3 
❤CI/CD: admin 재빌드
@CessnaJ
❤CI/CD: admin
cdf26bb
@CessnaJ
Merge pull request #256 from lotteon2/hotfix/front/ordersheet
a4f706b 
❤CI/CD: admin
@CessnaJ
✨FFix: ordersheet 가격 렌더링
eda00ba
@CessnaJ
Merge pull request #257 from lotteon2/hotfix/front/ordersheet
511faaa 
✨FFix: ordersheet 가격 렌더링
@CessnaJ
✨FFix: 가격 업데이트
580bdcf
@CessnaJ
Merge pull request #258 from lotteon2/hotfix/front/ordersheet
1542c0c 
✨FFix: 가격 업데이트
@CessnaJ
❤CI/CD: nginx conf업데이트
575d7c0
@CessnaJ
Merge pull request #259 from lotteon2/hotfix/front/ordersheet
c3b6c21 
❤CI/CD: nginx conf업데이트
@ssjy4974
fix : cartDto 수정
d8cf4a5
qwerty1434 and others added 30 commits November 3, 2023 11:29
@qwerty1434
fix : Swal 추가
c95ab7e
@qwerty1434
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
66ef41e
@CessnaJ
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
8d50456
@CessnaJ
Fix: qr에서 payment cancel/fail을 위한 url수정 -yml
6cac439
@CessnaJ
Fix: qr에서 payment cancel/fail을 위한 url수정 -yml
772503f
@ssjy4974
fix : 관리자 계정 수정 및 카트 0개 상품 주문시 방어 로직 추가
3b17895
@ssjy4974
Merge pull request #317 from lotteon2/feat/fe/product
93adaf4 
fix : 관리자 계정 수정 및 카트 0개 상품 주문시 방어 로직 추가
@PlayEnergy
feat : 스케줄러 추가
fc4446e
@PlayEnergy
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into stora…
2ba75f4 
…ge-service-new
@PlayEnergy
feat : 스케줄러 추가
b11e3f5
@PlayEnergy
Merge pull request #318 from lotteon2/storage-service-new
ad3e4c5 
Storage service new
@PlayEnergy
feat : 디자인 수정
4c2de34
@PlayEnergy
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into front…
1c5f1ca 
…-admin
@PlayEnergy
Merge pull request #319 from lotteon2/front-admin
be1e58e 
Front admin
@PlayEnergy
feat : 셀렉트 박스 디폴트값 수정
7acfb57
@PlayEnergy
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into front…
138133f 
…-admin
@PlayEnergy
Merge pull request #320 from lotteon2/front-admin
779ecd2 
Front admin
@PlayEnergy
fix : 에러 수정
1cfdcdc
@PlayEnergy
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into front…
28a7ec6 
…-admin
@PlayEnergy
Merge pull request #321 from lotteon2/front-admin
b55c50b 
Front admin
@PlayEnergy
fix : api fix
32ee0c0
@PlayEnergy
Merge pull request #322 from lotteon2/front-admin
9ccc3a1 
fix : api fix
@PlayEnergy
test
a84735d
@PlayEnergy
Merge pull request #324 from lotteon2/front-admin
151d80f 
test
@ssjy4974
fix : 비로그인 카트 조회 방어 로직
ff3ed65
@ssjy4974
Merge pull request #325 from lotteon2/feat/fe/product
fec8ee8 
fix : 비로그인 카트 조회 방어 로직
@ssjy4974
fix : cart selectedQuantity 수정
5257b7d
@ssjy4974
Merge pull request #328 from lotteon2/feat/fe/product
27b245a 
fix : cart selectedQuantity 수정
@CessnaJ
❤CI/CD: 통합 빌드
f7650cf
@CessnaJ
CI/CD: cart 재빌드
fc46ccf
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@CessnaJ @ssjy4974 @qwerty1434 @JIUNG9 @PlayEnergy