Merge remote-tracking branch 'origin/feat/#44-add-club-pray' into fea… · PrayHelper/Uspray-spring@af2afe0 · GitHub

Commit

Merge remote-tracking branch 'origin/feat/#44-add-club-pray' into feat/…

Browse files

…#44-add-club-pray

# Conflicts:
#	src/main/java/com/uspray/uspray/Enums/PrayType.java
#	src/main/java/com/uspray/uspray/InitDb.java
#	src/main/java/com/uspray/uspray/domain/Pray.java
#	src/main/java/com/uspray/uspray/exception/SuccessStatus.java

Loading branch information

dong2ast committed Nov 7, 2023

2 parents e60c057 + 2bc2cd6 commit af2afe0