Merge branch 'develop'

DongnaeFriend · Aug 20, 2023 · ce0c9da · ce0c9da
2 parents 8f319cf + 82b3d80
commit ce0c9da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/com/umc/DongnaeFriend/domain/account/book/dto/Expense.java b/src/main/java/com/umc/DongnaeFriend/domain/account/book/dto/Expense.java
@@ -7,6 +7,6 @@
 @Data
 @AllArgsConstructor
 public class Expense {
-    public Integer transactionCategory;
+    public TransactionCategory transactionCategory;
     public long price;
 }
diff --git a/src/main/java/com/umc/DongnaeFriend/domain/account/book/dto/MemoDto.java b/src/main/java/com/umc/DongnaeFriend/domain/account/book/dto/MemoDto.java
@@ -57,6 +57,7 @@ public Memo toEntity(AccountBook accountBook){
             return Memo.builder()
                     .accountBook(accountBook)
                     .memo(memo)
+                    .done(done)
                     .build();
         }
     }