Merge branch 'develop' into feat-selectNewStockmon-#3

StockmonGo · Aug 24, 2024 · 878dd9e · 878dd9e
2 parents 2da230b + c8bafc0
commit 878dd9e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,4 @@
+## ✅ 해야 할 작업을 TASK 별로 작성해주세요.
+- [ ] TASK
+
+<br><br>
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
+ex) [Feat] PR명 #00 (제목 작성후 지워주세요!)
+
+## 변경 사항 요약
+> 요약 내용 나열 + (이미지)
+- [ ]
+
+## 이슈 번호
+- close #00
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,5 @@ out/
 
 ### VS Code ###
 .vscode/
+
+application-db.properties
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,2 +1,3 @@
 spring.application.name=stockmon-be
 
+spring.config.import=application-db.properties
diff --git a/stock/src/main/java/com/pda/stock/entity/Stock.java b/stock/src/main/java/com/pda/stock/entity/Stock.java
@@ -0,0 +1,4 @@
+package com.pda.stock.entity;
+
+public class Stock {
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,3 +35,5 @@ out/

		### VS Code ###
		.vscode/

		application-db.properties
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,3 @@
		spring.application.name=stockmon-be

		spring.config.import=application-db.properties