Skip to content

Commit 9c6d645

Browse files
authored
Merge pull request #647 from JNU-econovation/develop
[Release] Version 1.2.1 배포
2 parents 670fb35 + d93ff1f commit 9c6d645

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
## 시스템 아키텍처
4747

48-
<img width="1000" alt="Image" src="https://github.com/user-attachments/assets/d013fc64-3b3a-4354-83a9-50a4117ae629">
48+
<img width="1000" alt="Image" src="https://github.com/user-attachments/assets/fef832c9-b8d8-4d19-bbdf-145dbb7386d1" />
4949

5050
## ERD
5151

resources/gaebaljip-develop-environment/mariadb-init/01_schema.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ CREATE TABLE `MEAL_FOOD_TB`
7373
`MEAL_FK` bigint(20) DEFAULT NULL,
7474
`MEAL_FOOD_MULTIPLE` double DEFAULT NULL,
7575
`MEAL_FOOD_G` int DEFAULT NULL,
76-
`MEAL_FOOD_UNIT_TYPE` varchar(255),
76+
`MEAL_FOOD_UNIT_TYPE` varchar(255) NOT NULL,
7777
PRIMARY KEY (`MEAL_FOOD_PK`),
7878
FOREIGN KEY (`FOOD_FK`) REFERENCES `FOOD_TB` (`FOOD_PK`),
7979
FOREIGN KEY (`MEAL_FK`)REFERENCES `MEAL_TB` (`MEAL_PK`)

src/main/java/com/gaebaljip/exceed/application/domain/meal/Unit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class Unit {
2727
private Double multiple;
2828

2929
@Enumerated(EnumType.STRING)
30-
@Column(name = ENTITY_PREFIX + "_UNIT_TYPE")
30+
@Column(name = ENTITY_PREFIX + "_UNIT_TYPE", nullable = false)
3131
private UnitType unitType;
3232

3333
public static Unit createUnit(Integer g, Double multiple) {

0 commit comments

Comments
 (0)