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

build: 배포 확인 #40

Merged
merged 102 commits into from
Jul 2, 2024
Merged

build: 배포 확인 #40

merged 102 commits into from
Jul 2, 2024

Conversation

yubin-im
Copy link
Contributor

@yubin-im yubin-im commented Jul 2, 2024

No description provided.

yubin-im and others added 30 commits June 25, 2024 13:48
@yubin-im
feat: Reservation 테이블 기본 클래스 생성
8f89fd3
@Do760
feat: user, host, and account domain are implemented
a7b15f5
@doSeung11
Merge pull request #5 from HanaFun/user
bee2e06 
feat: user, host, and account domain are implemented
@yubin-im
feat: Lesson, LessonDate, Category 테이블 기본 클래스 생성
8727b8e
@yubin-im
fix: LessonDate 테이블 기본 클래스 수정
edf3b85
@yubin-im
Merge pull request #6 from HanaFun/feat/reservation
0ff5df7 
Feat/reservation
@yubin-im
feat: 엔티티 클래스 연결
6af4d14
@yubin-im
Merge pull request #7 from HanaFun/feat/reservation
85d5abf 
feat: 엔티티 클래스 연결
@Do760
feat: user, host, and account domain are implemented
034fc44
@doSeung11
Merge pull request #8 from HanaFun/user
9e1cc79 
feat: user, host, and account domain are implemented
@yubin-im
feat: 마이페이지 데이터 출력(예약내역) 기능 구현
84b3cb6
@yubin-im
fix: 마이페이지- 예약 내역 오늘 이후만 출력되도록 수정
fc1edb8
@yubin-im
Merge branch 'dev' of https://github.com/HanaFun/HanaFun_BE into feat…
f67eb7d 
…/reservation
@yubin-im
feat: 카테고리 전체 출력 기능 구현
baa8998
@yubin-im
feat: 엔티티 테이블명 소문자 변경
d5bfc7f
@yubin-im
Merge pull request #9 from HanaFun/feat/reservation
c91b4b1 
Feat/reservation
@yubin-im
fix: 카테고리 전체 출력 stream 사용으로 변경
0fbb442
@yubin-im
Merge pull request #10 from HanaFun/feat/reservation
c92d496 
fix: 카테고리 전체 출력 stream 사용으로 변경
@Do760
feat: common files are implemented
7cd31ef
@doSeung11
Merge branch 'dev' into user
4562ea8
@doSeung11
Merge pull request #11 from HanaFun/user
2342031 
feat: common files are implemented
@yubin-im
feat: 엔티티 BaseEntity 상속
871afe1
@yubin-im
Merge pull request #12 from HanaFun/feat/reservation
0dfefa3 
feat: 엔티티 BaseEntity 상속
@yubin-im
fix: 마이페이지 출력 REST 형식 변경
0176487
@yubin-im
feat: 마이페이지, 카테고리 출력 ApiResponse return으로 변경
a673567
@yubin-im
Merge pull request #15 from HanaFun/feat/reservation
93dc358 
Feat/reservation
@yubin-im
feat: 나의 신청 클래스 데이터 출력 기능 구현
a0d0455
@yubin-im
feat: 신청 클래스 일정 출력 기능 구현
47725ec
@yubin-im
feat: 개설 클래스 관리(개설 클래스 목록 전체출력) 기능 구현
1060d1d
@Do760
feat: user, host domain are implemented
9a5ce4f
Do760 and others added 29 commits June 27, 2024 17:46
@Do760
Merge branch 'dev' of https://github.com/HanaFun/HanaFun_BE into revenue
dd77c45
@doSeung11
Merge pull request #28 from HanaFun/revenue
6147a2d 
feat: revenue
@yubin-im
feat: 클래스 전체 조회(클래스 탐색) 기능 구현
94e4e42
@yubin-im
Merge pull request #29 from HanaFun/feat/category
4e8cb1a 
feat: 클래스 전체 조회(클래스 탐색) 기능 구현
@Do760
fix: revenue total
4b21fbd
@Do760
Merge branch 'dev' of https://github.com/HanaFun/HanaFun_BE into revenue
1c7a174
@doSeung11
Merge pull request #30 from HanaFun/revenue
8c7f863 
fix: revenue total
@Do760
fix: exception
c4e37a1
@Do760
Merge branch 'dev' of https://github.com/HanaFun/HanaFun_BE into revenue
ec99bc3
@seoyeon08
feat: 월별 매출액 & 클래스별 매출액 & 지출액 수정 API
b9aaa69
@doSeung11
Merge pull request #33 from HanaFun/revenue
1941125 
fix: exception
@seoyeon08
Merge branch 'dev' of https://github.com/HanaFun/HanaFun_BE into feat/#4
eed7e77
@doSeung11
Merge pull request #34 from HanaFun/feat/#4
e9a3243 
feat: revenue api
@alswlfl29
feat: 클래스 전체/카테고리 검색 및 필터 구현
5dd2677
@yubin-im
Merge pull request #35 from HanaFun/lesson
b31384a 
feat: 클래스 전체/카테고리 검색 및 필터 구현
@Do760
fix: revenue http method type
1144779
@Do760
Merge branch 'dev' of https://github.com/HanaFun/HanaFun_BE into revenue
60acf5b
@doSeung11
Merge pull request #36 from HanaFun/revenue
bd8acf1 
fix: revenue http method type
@yubin-im
build: Dokcerfile 작성
ec6c878
@yubin-im
Merge pull request #37 from HanaFun/feat/category
b210e30 
build: Dokcerfile 작성
@doSeung11
Update SecurityConfig.java
01139f0 
cors 추가
@doSeung11
Update QrReqDto.java
69b1416
@doSeung11
Update TransactionServiceImpl.java
376572b
@yubin-im
build: 자동배포 스크립트 작성
f464479
@yubin-im
Merge branch 'dev' of https://github.com/HanaFun/HanaFun_BE into feat…
60fef83 
…/category
@yubin-im
feat: 개설 클래스 목록 userId-> 토큰 사용으로 변경
78260af
@yubin-im
Merge pull request #38 from HanaFun/feat/category
c573b69 
Feat/category
@yubin-im
build: 자동배포 스크립트 코드 작성
f5b215e
@yubin-im
Merge pull request #39 from HanaFun/feat/category
4e9a170 
build: 자동배포 스크립트 코드 작성
@yubin-im yubin-im merged commit d216173 into main Jul 2, 2024
1 check failed
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
@yubin-im @Do760 @doSeung11 @seoyeon08 @alswlfl29