From 0c7e5753f4a5ee36e52e37f356b700991955348c Mon Sep 17 00:00:00 2001
From: myh <yunhao.meng@outlook.com>
Date: Mon, 6 Nov 2023 18:39:06 +0800
Subject: [PATCH] =?UTF-8?q?ID=E7=B1=BB=E5=9E=8B=E5=8C=B9=E9=85=8DJPA?=
 =?UTF-8?q?=E8=A6=81=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/springdemo/entities/Dishes.java      | 2 +-
 src/main/java/com/example/springdemo/entities/Merchants.java   | 2 +-
 src/main/java/com/example/springdemo/entities/OrderDishes.java | 2 +-
 src/main/java/com/example/springdemo/entities/Orders.java      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/springdemo/entities/Dishes.java b/src/main/java/com/example/springdemo/entities/Dishes.java
index 78b2534..950f421 100644
--- a/src/main/java/com/example/springdemo/entities/Dishes.java
+++ b/src/main/java/com/example/springdemo/entities/Dishes.java
@@ -18,7 +18,7 @@ import java.math.BigDecimal;
 public class Dishes {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;//主键，菜品ID
+    private Long id;//主键，菜品ID
     private String name;//菜品名称
     private BigDecimal price;//菜品价格
     private Integer discount;//菜品折扣
diff --git a/src/main/java/com/example/springdemo/entities/Merchants.java b/src/main/java/com/example/springdemo/entities/Merchants.java
index 90a6b4f..0619528 100644
--- a/src/main/java/com/example/springdemo/entities/Merchants.java
+++ b/src/main/java/com/example/springdemo/entities/Merchants.java
@@ -14,7 +14,7 @@ import java.util.List;
 public class Merchants {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;//主键,商家编号
+    private Long id;//主键,商家编号
     private String name;//店铺名字
     private String address;//店铺地址
     @Column(name = "phoneNumber")
diff --git a/src/main/java/com/example/springdemo/entities/OrderDishes.java b/src/main/java/com/example/springdemo/entities/OrderDishes.java
index da0fc2c..048cfa5 100644
--- a/src/main/java/com/example/springdemo/entities/OrderDishes.java
+++ b/src/main/java/com/example/springdemo/entities/OrderDishes.java
@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
 public class OrderDishes {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;//主键ID
+    private Long id;//主键ID
 
     @OneToOne(cascade = CascadeType.ALL)
     @JoinColumn(name = "dishesID", referencedColumnName = "id")
diff --git a/src/main/java/com/example/springdemo/entities/Orders.java b/src/main/java/com/example/springdemo/entities/Orders.java
index 87fe213..f80e44f 100644
--- a/src/main/java/com/example/springdemo/entities/Orders.java
+++ b/src/main/java/com/example/springdemo/entities/Orders.java
@@ -21,7 +21,7 @@ import java.util.List;
 public class Orders {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;//订单ID
+    private Long id;//订单ID
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "orders")
     @Column(name = "orderDishesID")