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.

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

DEV TO MAIN #1641

Merged
merged 31 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c9992f5
[FE] HOTFIX: 어드민 슬랙 알림 이모티콘 오류 수정
Z1Park Apr 16, 2024
bb32a65
[FE] HOTFIX: 어드민 슬랙 알림 띄어쓰기, 줄바꿈 수정
Z1Park Apr 16, 2024
cc981fd
[FE] 롤백 3차
Z1Park Apr 16, 2024
89e0ed7
Merge branch 'dev' of https://github.com/innovationacademy-kr/Cabi in…
enaenen Apr 21, 2024
78f2dcf
Merge branch 'dev' of https://github.com/innovationacademy-kr/Cabi in…
enaenen Apr 22, 2024
83fd803
[BE] HOTFIX : 수요지식회 기본 장소 3층 -> 지하실로 변경
Z1Park May 19, 2024
b5b093e
[FE] FIX: Dropdown 에서 selectedIdx 가 음수인 경우와 options 가 빈 배열일 경우 예외처리 추…
junyoung2015 Jun 10, 2024
b089cff
Merge pull request #1627 from innovationacademy-kr/fe/dev/fix_present…
junyoung2015 Jun 10, 2024
b39a6ff
Common/dev/feat coin#1604 (#1628)
chyo1 Jun 11, 2024
1edd3f4
[BE] FIX : 0원 금액의 연장권이 코인 내역에 보이는 현상 수정
Z1Park Jun 13, 2024
b191884
[BE] FEAT: 관리자 지급 보상 추가
chyo1 Jun 13, 2024
e9ca988
Merge branch 'dev' of https://github.com/innovationacademy-kr/Cabi in…
enaenen Jun 13, 2024
38196b9
[BE] FEAT: 관리자 지급 보상 추가
chyo1 Jun 13, 2024
7260626
[BE] FIX : 로컬 DDL 관리자 아이템 추가
Z1Park Jun 13, 2024
5ca526a
Merge branch 'dev' of github.com:innovationacademy-kr/Cabi into dev
chyo1 Jun 13, 2024
9a33276
Merge branch 'dev' of github.com:innovationacademy-kr/Cabi into dev
chyo1 Jun 13, 2024
8f30343
Merge branch 'dev' of https://github.com/innovationacademy-kr/Cabi in…
enaenen Jun 13, 2024
e42ce79
[BE] FIX : 관리자 보상 Sku 변경gp
Z1Park Jun 13, 2024
098d1df
Merge branch 'main' of https://github.com/innovationacademy-kr/Cabi i…
enaenen Jun 13, 2024
ad82526
Merge remote-tracking branch 'origin/dev' into dev
enaenen Jun 13, 2024
44b4d4d
[FE] FIX: AdminSlackNotiPage import 빠져있는거 넣음
jnkeniaem Jun 13, 2024
bad3eb3
Merge branch 'dev' of https://github.com/innovationacademy-kr/Cabi in…
jnkeniaem Jun 13, 2024
6bea299
Merge branch 'dev' of https://github.com/innovationacademy-kr/Cabi in…
jnkeniaem Jun 13, 2024
33af29d
[FE] ETC: 동점->동전#1604
jnkeniaem Jun 13, 2024
2da9d74
Merge branch 'dev' of https://github.com/innovationacademy-kr/Cabi in…
jnkeniaem Jun 13, 2024
440498d
[FE] ETC: 동점-> 동전#1604
jnkeniaem Jun 13, 2024
2233e94
Merge branch 'dev' of https://github.com/innovationacademy-kr/42cabi …
Jun 13, 2024
baea22a
[FE] FIX: 인벤토리 아이템 설명 문구 수정
Jun 13, 2024
4248bc3
[BE] HOTFIX : 알람권 오류 수정
Z1Park Jun 13, 2024
0c94794
Merge branch 'dev' of github.com:innovationacademy-kr/42cabi into dev
Z1Park Jun 13, 2024
c0aaf4b
[FE] CI/CD 문제 해결
Z1Park Jun 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
Expand All @@ -30,7 +31,7 @@
@ToString(exclude = {"user", "club"})
@Log4j2
@EntityListeners(AuditingEntityListener.class)
@NoArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class ClubRegistration {

@Id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
public class SectionAlarm {

@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

/**
Expand Down
Loading
Loading