Merge branch 'defalut/feat/merge' into fe-develop

README.md

@@ -5,10 +5,11 @@
 [<img width="1464" alt="스크린샷 2024-12-18 오후 12 19 13" src="https://github.com/user-attachments/assets/2d1f8c70-fd90-4f4b-9494-3cf1e2f5813a" />](https://app.baguni.kr/)
 
 ## 팀원 소개
-| **[김승태](https://github.com/dmdgpdi)** | **[오송민](https://github.com/obvoso)** |
-| :-: | :-: |
-| <a href="https://github.com/dmdgpdi"><img src="https://avatars.githubusercontent.com/dmdgpdi" width=200px /> | <a href="https://github.com/obvoso"><img src="https://avatars.githubusercontent.com/obvoso" width=200px /> |
-| Frontend | Frontend |
+| **[팀장 : 김민규](https://github.com/kimminkyeu)** | **[팀원 : 김승태](https://github.com/dmdgpdi)** | **[팀원 : 오송민](https://github.com/obvoso)** | **[팀원 : 박수형](https://github.com/Gyaak)** | **[팀원 : 양상원](https://github.com/sangwonsheep)** |
+| :-: | :-: | :-: | :-: | :-: |
+| <a href="https://github.com/kimminkyeu"><img src="https://avatars.githubusercontent.com/kimminkyeu" width=200px /> | <a href="https://github.com/dmdgpdi"><img src="https://avatars.githubusercontent.com/dmdgpdi" width=200px /> | <a href="https://github.com/obvoso"><img src="https://avatars.githubusercontent.com/obvoso" width=200px /> | <a href="https://github.com/Gyaak"><img src="https://avatars.githubusercontent.com/Gyaak" width=200px /> | <a href="https://github.com/sangwonsheep"><img src="https://avatars.githubusercontent.com/sangwonsheep" width=200px /> |
+| Backend | Frontend | Frontend | Backend | Backend |
+
 
 ## 프로젝트 소개
 ### 만들게 된 계기
@@ -44,15 +45,35 @@
         <img src="https://img.shields.io/badge/Next.js-000000?style=for-the-badge&logo=Next.js&logoColor=white"/>
         <img src="https://img.shields.io/badge/Zustand-6492FE?style=for-the-badge&logo=Zustand&logoColor=white"/>
     </div>
+    <p><strong>Backend</strong></p>
+    <div>
+        <img src="https://img.shields.io/badge/Java_17-007396?style=for-the-badge&logo=java&logoColor=white"> 
+        <img src="https://img.shields.io/badge/Spring_Boot-6DB33F?style=for-the-badge&logo=spring boot&logoColor=white">
+        <img src="https://img.shields.io/badge/spring_Data_JPA-6DB33F?style=for-the-badge&logo=spring&logoColor=white"> 
+        <img src="https://img.shields.io/badge/Spring_Security-6DB33F?style=for-the-badge&logo=spring security&logoColor=white">
+    </div>
+    <p><strong>Database</strong></p>
+    <div>
+        <img src="https://img.shields.io/badge/Mysql-4479A1?style=for-the-badge&logo=mysql&logoColor=white">
+        <img src="https://img.shields.io/badge/MongoDB-47A248?style=for-the-badge&logo=mongodb&logoColor=white">
+        <img src="https://img.shields.io/badge/OpenSearch-005EB8?style=for-the-badge&logo=opensearch&logoColor=white"/>
+    </div>
     <p><strong>Infra</strong></p>
     <div>
         <img src="https://img.shields.io/badge/Vercel-000000?style=for-the-badge&logo=vercel&logoColor=white"/>
-        <img src="https://img.shields.io/badge/Github Action-2088FF?style=for-the-badge&logo=github action&logoColor=white"/>
+        <img src="https://img.shields.io/badge/Docker-2496ED?style=for-the-badge&logo=Docker&logoColor=white"/>
+        <img src="https://img.shields.io/badge/GitHub_Actions-2088FF?style=for-the-badge&logo=github-actions&logoColor=white"><br>
+    </div>
+    <p><strong>Others</strong></p>
+    <div>
+        <img src="https://img.shields.io/badge/RabbitMQ-FF6600?style=for-the-badge&logo=rabbitmq&logoColor=white"/>
+        <img src="https://img.shields.io/badge/Logstash-005571?style=for-the-badge&logo=logstash&logoColor=white"/>
+        <img src="https://img.shields.io/badge/Beats-005571?style=for-the-badge&logo=beats&logoColor=white"/>
     </div>
 </div>
 
 ## 운영 서버
-### [:link: Frontend](https://github.com/Kernel360/F2-BAGUNI/tree/frontend)
+### [:link: Frontend](https://github.com/Kernel360/F2-BAGUNI/tree/fe-develop)
 ### [:link: Backend](https://github.com/Kernel360/F2-BAGUNI/tree/be-develop)