Skip to content
Open

Dev #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
659 commits
Select commit Hold shift + click to select a range
282791c
Merge pull request #245 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
c06a1cc
add : 바로 구매하기 console log 추가
ssjy4974 Nov 1, 2023
c5b8694
Merge pull request #246 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
4a7ce12
fix : 바로구매하기 수정
ssjy4974 Nov 1, 2023
4cc3fe8
Merge pull request #247 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
fe429e1
fix : ordersheetInfos 수정
ssjy4974 Nov 1, 2023
7907f7d
Merge pull request #248 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
740c7e0
fix : 바로구매주문시 stock 수정
ssjy4974 Nov 1, 2023
31fa9ec
Merge pull request #249 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
5c917f4
add : addOrderSheet 콘솔 확인
ssjy4974 Nov 1, 2023
5f21816
Merge pull request #250 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
81b12c6
add : orderSheetItems 추가
ssjy4974 Nov 1, 2023
2218bdb
Merge pull request #251 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
10a92f2
✨Feat: 주문서에 결제금액 나오도록 처리
CessnaJ Nov 1, 2023
f63cfe3
Merge pull request #252 from lotteon2/hotfix/front/ordersheet
CessnaJ Nov 1, 2023
ae01685
add : 관리자 로그인 리다이렉트, 로그인 하지 않은 유저 방어 로직 추가
ssjy4974 Nov 1, 2023
a50de88
Merge pull request #253 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
3e1fe8e
Merge pull request #254 from lotteon2/order-service
qwerty1434 Nov 1, 2023
3f8ab84
:sparkles: Faet : 주문에 주소 추가
qwerty1434 Nov 1, 2023
b2d534e
❤CI/CD: admin 재빌드
CessnaJ Nov 1, 2023
e6aa5c3
Merge pull request #255 from lotteon2/hotfix/front/ordersheet
CessnaJ Nov 1, 2023
cdf26bb
❤CI/CD: admin
CessnaJ Nov 1, 2023
a4f706b
Merge pull request #256 from lotteon2/hotfix/front/ordersheet
CessnaJ Nov 1, 2023
eda00ba
✨FFix: ordersheet 가격 렌더링
CessnaJ Nov 1, 2023
511faaa
Merge pull request #257 from lotteon2/hotfix/front/ordersheet
CessnaJ Nov 1, 2023
580bdcf
✨FFix: 가격 업데이트
CessnaJ Nov 1, 2023
1542c0c
Merge pull request #258 from lotteon2/hotfix/front/ordersheet
CessnaJ Nov 1, 2023
575d7c0
❤CI/CD: nginx conf업데이트
CessnaJ Nov 1, 2023
c3b6c21
Merge pull request #259 from lotteon2/hotfix/front/ordersheet
CessnaJ Nov 1, 2023
d8cf4a5
fix : cartDto 수정
ssjy4974 Nov 1, 2023
3afbd11
Merge pull request #260 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
08310b1
fix: fix the unmapped the filed by mapper
JIUNG9 Nov 1, 2023
82e59b4
Merge pull request #261 from lotteon2/dev-cart-service
JIUNG9 Nov 1, 2023
d8668c3
fix : pathvariable 수정 및 테스트 코드 변경
ssjy4974 Nov 1, 2023
5a8d207
fix : memberResponse 반환 정보 변경
ssjy4974 Nov 1, 2023
b90f88b
fix : memberInfo 정보 수정
ssjy4974 Nov 1, 2023
87d85d0
Merge pull request #262 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
f144467
✨Feat: 주문서 이메일 받아오기
CessnaJ Nov 1, 2023
15406e0
Merge pull request #263 from lotteon2/hotfix/front/ordersheet
CessnaJ Nov 1, 2023
cd3bbd5
:sparkles: Feat : 장바구니 상품 가져오기
qwerty1434 Nov 1, 2023
30fa7fa
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
qwerty1434 Nov 1, 2023
a6d298b
✨Feat: 주문서 주소 연동
CessnaJ Nov 1, 2023
7a0d4f4
Merge pull request #264 from lotteon2/hotfix/front/ordersheet
CessnaJ Nov 1, 2023
30623b5
fix : 마감임박 상품 리스트 조회 api 수정
ssjy4974 Nov 1, 2023
ad50cf6
:pencil2: Fix : 백엔드 데이터와 변수명 통일
qwerty1434 Nov 1, 2023
ad3a107
Merge pull request #265 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
bd47cc3
fix : memberResponse 수정
ssjy4974 Nov 1, 2023
b0de544
Merge pull request #266 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
a25bb56
✨FFix 주소 담아서 보내기
CessnaJ Nov 1, 2023
3976eab
Merge pull request #267 from lotteon2/hotfix/front/ordersheet
CessnaJ Nov 1, 2023
9d38fe1
add: add the cart jar which is returning cart list dto fields
JIUNG9 Nov 1, 2023
93f8bda
Merge pull request #268 from lotteon2/dev-cart-service
JIUNG9 Nov 1, 2023
1b7c59d
:pencil2: Fix : 이전 수정 원상복구
qwerty1434 Nov 1, 2023
b3e9e57
fix : 마감임박 상품 수정
ssjy4974 Nov 1, 2023
7af1eef
Merge pull request #269 from lotteon2/feat/fe/product
ssjy4974 Nov 1, 2023
8da8a0b
:pencil2: Fix : 할인가격은 null을 입력할 수 있도록 변경
qwerty1434 Nov 1, 2023
ba1d600
Merge pull request #270 from lotteon2/order-service
qwerty1434 Nov 1, 2023
116ab68
Merge pull request #271 from lotteon2/order-service
qwerty1434 Nov 1, 2023
ecbd387
:pencil2: Fix : feign요청에 header 추가
qwerty1434 Nov 1, 2023
1594cf3
✔Refactor: oauthid로 명명된필드 모두 userId로 변경
CessnaJ Nov 1, 2023
b9747d2
:pencil2: Fix : 장바구니 가격 표현 로직 변경
qwerty1434 Nov 1, 2023
b56e286
Merge pull request #272 from lotteon2/hotfix/be/payment
CessnaJ Nov 1, 2023
6d50f3c
❤CI/CD: payment 재빌드
CessnaJ Nov 1, 2023
34cd968
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 1, 2023
cf406bf
✨Fix: userId getUserId로 변경
CessnaJ Nov 1, 2023
c5e7b86
🎨Fix: toString찍어보기
CessnaJ Nov 1, 2023
258b387
:pencil2: Fix : discountedPrice 값 확인
qwerty1434 Nov 1, 2023
3608ea0
🎨Fix: discountedPrice에 null 들어오는것 처리
CessnaJ Nov 1, 2023
ea3f616
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 1, 2023
4d86ee2
:pencil2: Fix : 할인여부에 따른 가격 표시 변경
qwerty1434 Nov 1, 2023
8beb578
❤CI/CD: payment 재빌드
CessnaJ Nov 1, 2023
455571d
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 1, 2023
5a4c886
❤CI/CD: payment 재빌드
CessnaJ Nov 1, 2023
601aee3
:pencil2: Fix : 장바구니의 금액 계산 방식 수정
qwerty1434 Nov 1, 2023
cee5156
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
qwerty1434 Nov 1, 2023
5a7b61f
🎨CI/CD: payment approve url에 province 추가
CessnaJ Nov 1, 2023
1f791ba
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 1, 2023
77970ae
:pencil2: Fix : server환경에서 결제 진행을 위한 수정
qwerty1434 Nov 1, 2023
4632904
Merge pull request #273 from lotteon2/order-service
qwerty1434 Nov 1, 2023
dc9010a
❤CI/CD: redirecturl에 order추가
CessnaJ Nov 1, 2023
3d32025
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 1, 2023
d45af43
✨Feat: gateway에 kakaopay redirection을 위한 규칙 추가
CessnaJ Nov 1, 2023
3fb2abf
Fix: payment 승인 후, fe redirect uri 경로변경
CessnaJ Nov 1, 2023
0ca2187
Fix: 결제 후 자동 창닫기 origin 수정
CessnaJ Nov 1, 2023
0ab0503
fix : 상품 상세조회 province 고정값 삭제
ssjy4974 Nov 2, 2023
0a57643
Merge pull request #274 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
da9f530
fix : 상품 상세 province 수정
ssjy4974 Nov 2, 2023
8cc2b5b
Merge pull request #275 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
fc74371
fix : 마감할인 상품 상세 조회 수정
ssjy4974 Nov 2, 2023
b8ad770
fix : 마감상품, 상품 상세 수정
ssjy4974 Nov 2, 2023
871f764
Merge pull request #276 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
76ce0aa
fix : index.ts api url 수정
ssjy4974 Nov 2, 2023
0671ecf
Merge pull request #277 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
75838f9
fix : 상품 상세 province 수정...
ssjy4974 Nov 2, 2023
24b8269
:pencil2: 일반주문과 마감임박 주문에 대한 요청을 구분해 처리
qwerty1434 Nov 2, 2023
4c8090c
fix : member.ts 수정
ssjy4974 Nov 2, 2023
11c3ad9
:pencil2: Fix : redirect 주소 수정
qwerty1434 Nov 2, 2023
365188e
:pencil2: Fix : Resolve Merge Conflicts
qwerty1434 Nov 2, 2023
c97d3ef
:sparkles: Feat : 장바구니 주문하기 버튼 연결
qwerty1434 Nov 2, 2023
f509ef6
fix : url, 상품상세 재고 없는 경우 막음
ssjy4974 Nov 2, 2023
4c0a8d9
Merge pull request #279 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
8b16d80
:pencil2: Fix : alert정보 수정
qwerty1434 Nov 2, 2023
cfa65ba
:pencil2: Fix : 데이터 전달 수정
qwerty1434 Nov 2, 2023
77c89ec
:pencil2: Fix : 장바구니 내 가격 표시 수정
qwerty1434 Nov 2, 2023
b63bdba
:pencil2: Fix : 숫자 포매팅
qwerty1434 Nov 2, 2023
a2d925f
add : 프론트 추가
ssjy4974 Nov 2, 2023
196c3ac
Merge pull request #281 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
7eb49b5
fix : 할인상품 디테일 api 수정
ssjy4974 Nov 2, 2023
dcd99de
Merge pull request #282 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
1ab6f10
:pencil2: Fix : 디자인 수정
qwerty1434 Nov 2, 2023
cb4b7fd
fix : memberInfo 수정
ssjy4974 Nov 2, 2023
12a05ff
Merge pull request #283 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
ae3a593
Merge pull request #284 from lotteon2/order-service
qwerty1434 Nov 2, 2023
4824347
:pencil2: Fix : 상태변경 로직에 누락된 @Transactional 수정
qwerty1434 Nov 2, 2023
da243e5
fix : member custom repository 수정
ssjy4974 Nov 2, 2023
85917cf
Merge pull request #285 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
58df054
Merge pull request #286 from lotteon2/order-service
qwerty1434 Nov 2, 2023
f0f7b86
:recycle: Refactor : userId 고정값으로 받던거 제거
qwerty1434 Nov 2, 2023
36a16c6
✨Feat: 영수증정보 가져오는 api
CessnaJ Nov 2, 2023
da07678
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 2, 2023
b63c65b
fix : member repository 수정
ssjy4974 Nov 2, 2023
0e440dc
Merge pull request #287 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
f066e06
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 2, 2023
58b6635
Fix: payments로 url 변경
CessnaJ Nov 2, 2023
a73a7a1
Fix: 영수증 결제정보 렌더링
CessnaJ Nov 2, 2023
da8540c
admin page test
PlayEnergy Nov 2, 2023
6c2fd32
add: add the fixed jar file
JIUNG9 Nov 2, 2023
dc8758e
✨Fix: 영수증 상품정보 렌더링
CessnaJ Nov 2, 2023
8cfe3bc
Merge pull request #289 from lotteon2/dev-cart-service
JIUNG9 Nov 2, 2023
34f4201
Merge branch 'dev' into front-admin
PlayEnergy Nov 2, 2023
f6a47c9
Merge pull request #288 from lotteon2/front-admin
PlayEnergy Nov 2, 2023
9585558
fix: fix the method parameter Province to String
JIUNG9 Nov 2, 2023
7d6364c
Merge pull request #290 from lotteon2/dev-cart-service
JIUNG9 Nov 2, 2023
d5a40c6
fix: fix the ProductEntity Province to String
JIUNG9 Nov 2, 2023
9b54d96
Merge pull request #291 from lotteon2/dev-cart-service
JIUNG9 Nov 2, 2023
64f6015
test
PlayEnergy Nov 2, 2023
da4bf40
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into front…
PlayEnergy Nov 2, 2023
fedf898
Merge pull request #292 from lotteon2/front-admin
PlayEnergy Nov 2, 2023
43db506
:pencil2: Fix : 주문상세정보 버튼이 데이터를 요청하도록 변경
qwerty1434 Nov 2, 2023
9f43e76
add : 주문조회 링크 추가
ssjy4974 Nov 2, 2023
dee12f3
Merge pull request #293 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
5e10abe
:pencil2: Fix : ORDER_URL을 localhost에서 서버로 변경
qwerty1434 Nov 2, 2023
7fdcc5f
style : 콘솔 삭제
ssjy4974 Nov 2, 2023
e461ea3
Merge pull request #294 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
dd9322f
add: add the jar
JIUNG9 Nov 2, 2023
37bdbc5
test2
PlayEnergy Nov 2, 2023
1adc11a
Merge pull request #296 from lotteon2/front-admin
PlayEnergy Nov 2, 2023
73d46d8
style: 주석제거
ssjy4974 Nov 2, 2023
4610d7d
Merge pull request #297 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
3296e2b
add: add the removed Province jar
JIUNG9 Nov 2, 2023
09730a0
fix: fix the localhost applcation yml server setting to cloud server …
JIUNG9 Nov 2, 2023
da82259
:pencil2: Fix : 결제 모달 수정
qwerty1434 Nov 2, 2023
aa8a654
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
qwerty1434 Nov 2, 2023
c832e2c
❤CI/CD: 통합빌드
CessnaJ Nov 2, 2023
d9c6f29
❤CI/CD:admin 빌드
CessnaJ Nov 2, 2023
5ac7244
fix : api url 수정
ssjy4974 Nov 2, 2023
266fd92
Merge branch 'dev' into feat/fe/product
ssjy4974 Nov 2, 2023
5c4e8ce
Merge pull request #300 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
b5738db
Merge pull request #299 from lotteon2/dev-cart-service
JIUNG9 Nov 2, 2023
0621bf0
token test
PlayEnergy Nov 2, 2023
5206314
Merge pull request #301 from lotteon2/front-admin
PlayEnergy Nov 2, 2023
df1bfde
add: add the jar
JIUNG9 Nov 2, 2023
206c898
Merge pull request #302 from lotteon2/dev-cart-service
JIUNG9 Nov 2, 2023
b4996f0
fix : cors 수정
PlayEnergy Nov 2, 2023
07a6b90
Fix: payment - bargain
CessnaJ Nov 2, 2023
7a41d4a
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 2, 2023
8f8feb7
403 error test
PlayEnergy Nov 2, 2023
38edaed
Merge pull request #304 from lotteon2/front-admin
PlayEnergy Nov 2, 2023
e889faf
add: add the jar:
JIUNG9 Nov 2, 2023
6011e2d
fix : product api province 수정
ssjy4974 Nov 2, 2023
754e030
Merge pull request #305 from lotteon2/dev-cart-service
JIUNG9 Nov 2, 2023
2efd94d
fix : console log 삭제
ssjy4974 Nov 2, 2023
2d7f58e
Merge pull request #306 from lotteon2/feat/fe/product
ssjy4974 Nov 2, 2023
c4b7759
❤CI/CD: gateway - stroage에 필터제거
CessnaJ Nov 2, 2023
6ca7f66
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 2, 2023
80cb05b
fix : cors 수정
PlayEnergy Nov 2, 2023
ee3ccfb
Merge pull request #303 from lotteon2/storage-service-new
JIUNG9 Nov 2, 2023
2b6b22c
:pencil2: Fix : 가격계산 수정
qwerty1434 Nov 2, 2023
225d82d
fix : 유저리스트 간격 수정
PlayEnergy Nov 2, 2023
708c3ca
Merge pull request #307 from lotteon2/front-admin
PlayEnergy Nov 2, 2023
237e55a
❤CI/CD: payment - isbargain 변수추가
CessnaJ Nov 2, 2023
6ffabf4
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 2, 2023
63dc028
❤CI/CD: payment 변수 잘 들어오는지 로그 추가
CessnaJ Nov 2, 2023
4623feb
Merge pull request #308 from lotteon2/order-service
qwerty1434 Nov 2, 2023
c6d3fb3
:pencil2: Fix : 매개변수 추가
qwerty1434 Nov 2, 2023
3b661e1
fix : 유저리스트 여백 수정
PlayEnergy Nov 2, 2023
19ff43f
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into front…
PlayEnergy Nov 2, 2023
a18ec86
Merge pull request #309 from lotteon2/front-admin
PlayEnergy Nov 2, 2023
bc5da17
Fix: 결제 test
CessnaJ Nov 2, 2023
a2de8e0
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 2, 2023
b1ac221
:pencil2: Fix : 가격계산 수정
qwerty1434 Nov 3, 2023
b0751a5
:pencil2: Fix : 주문상세의 상태 변경
qwerty1434 Nov 3, 2023
39b614f
Fix: 주문서가격 디스플레이 정보 수정
CessnaJ Nov 3, 2023
ad8c505
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 3, 2023
cd0b3f5
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
qwerty1434 Nov 3, 2023
029a011
:pencil2: Fix : 가격계산 수정
qwerty1434 Nov 3, 2023
5a9af7a
Fix: 광고쪽 텍스트 제거
CessnaJ Nov 3, 2023
971caa3
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 3, 2023
946a3b5
Chore: 주문서 log 제거
CessnaJ Nov 3, 2023
24f6459
Merge pull request #310 from lotteon2/order-service
qwerty1434 Nov 3, 2023
fc98ea3
:pencil2: Fix : 카트 서비스에 맞게 통신 수정
qwerty1434 Nov 3, 2023
11b7460
Merge pull request #312 from lotteon2/order-service
qwerty1434 Nov 3, 2023
7b37e56
:pencil2: Fix : 로그 추가
qwerty1434 Nov 3, 2023
f36f0c8
:pencil2: Fix : Cart여부 추가
qwerty1434 Nov 3, 2023
3ddcfd6
Merge pull request #313 from lotteon2/order-service
qwerty1434 Nov 3, 2023
34c26d2
:pencil2: Fix : cart와 변수명 통일
qwerty1434 Nov 3, 2023
876ee8d
Merge pull request #314 from lotteon2/order-service
qwerty1434 Nov 3, 2023
be830c7
:pencil2: Fix : 변수명 변경에 따른 수정
qwerty1434 Nov 3, 2023
4cf8a94
Merge pull request #315 from lotteon2/order-service
qwerty1434 Nov 3, 2023
a219d41
:pencil2: Fix : 장바구니 로그 수정
qwerty1434 Nov 3, 2023
34e1c41
feat : redis refresh 관련 설정 추가
PlayEnergy Nov 3, 2023
2267d0c
Fix: 결제 실패시 팝업 업데이트
CessnaJ Nov 3, 2023
dc93070
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 3, 2023
eec3c2d
:pencil2: Fix : discountedPrice null허용 금지
qwerty1434 Nov 3, 2023
5d1bd9c
Fix: webclient 쏘기 전에 금액계산하는 부분 null에 더해 0도 처리추가
CessnaJ Nov 3, 2023
e6288ec
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 3, 2023
c538ae6
:pencil2: Fix : Cart와 feign통신 서버테스트
qwerty1434 Nov 3, 2023
41777b9
:pencil2: Fix : dto 이름 변경
qwerty1434 Nov 3, 2023
9d87ca7
Merge pull request #316 from lotteon2/order-service
qwerty1434 Nov 3, 2023
f842439
Fix: 상품주문내역list 데이터 수정
CessnaJ Nov 3, 2023
c95ab7e
fix : Swal 추가
qwerty1434 Nov 3, 2023
66ef41e
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
qwerty1434 Nov 3, 2023
8d50456
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into dev
CessnaJ Nov 3, 2023
6cac439
Fix: qr에서 payment cancel/fail을 위한 url수정 -yml
CessnaJ Nov 3, 2023
772503f
Fix: qr에서 payment cancel/fail을 위한 url수정 -yml
CessnaJ Nov 3, 2023
3b17895
fix : 관리자 계정 수정 및 카트 0개 상품 주문시 방어 로직 추가
ssjy4974 Nov 3, 2023
93adaf4
Merge pull request #317 from lotteon2/feat/fe/product
ssjy4974 Nov 3, 2023
fc4446e
feat : 스케줄러 추가
PlayEnergy Nov 3, 2023
2ba75f4
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into stora…
PlayEnergy Nov 3, 2023
b11e3f5
feat : 스케줄러 추가
PlayEnergy Nov 3, 2023
ad3e4c5
Merge pull request #318 from lotteon2/storage-service-new
PlayEnergy Nov 3, 2023
4c2de34
feat : 디자인 수정
PlayEnergy Nov 3, 2023
1c5f1ca
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into front…
PlayEnergy Nov 3, 2023
be1e58e
Merge pull request #319 from lotteon2/front-admin
PlayEnergy Nov 3, 2023
7acfb57
feat : 셀렉트 박스 디폴트값 수정
PlayEnergy Nov 3, 2023
138133f
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into front…
PlayEnergy Nov 3, 2023
779ecd2
Merge pull request #320 from lotteon2/front-admin
PlayEnergy Nov 3, 2023
1cfdcdc
fix : 에러 수정
PlayEnergy Nov 3, 2023
28a7ec6
Merge branch 'dev' of https://github.com/lotteon2/LotFresh into front…
PlayEnergy Nov 3, 2023
b55c50b
Merge pull request #321 from lotteon2/front-admin
PlayEnergy Nov 3, 2023
32ee0c0
fix : api fix
PlayEnergy Nov 3, 2023
9ccc3a1
Merge pull request #322 from lotteon2/front-admin
PlayEnergy Nov 3, 2023
a84735d
test
PlayEnergy Nov 3, 2023
151d80f
Merge pull request #324 from lotteon2/front-admin
PlayEnergy Nov 3, 2023
ff3ed65
fix : 비로그인 카트 조회 방어 로직
ssjy4974 Nov 3, 2023
fec8ee8
Merge pull request #325 from lotteon2/feat/fe/product
ssjy4974 Nov 3, 2023
5257b7d
fix : cart selectedQuantity 수정
ssjy4974 Nov 3, 2023
27b245a
Merge pull request #328 from lotteon2/feat/fe/product
ssjy4974 Nov 3, 2023
f7650cf
❤CI/CD: 통합 빌드
CessnaJ Nov 6, 2023
fc46ccf
CI/CD: cart 재빌드
CessnaJ Nov 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified .DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions .idea/LotFresh.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
6 changes: 6 additions & 0 deletions .idea/jpa-buddy.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "disabled"
}
Loading