Merge branch '20172'

src/main/java/entities/Indent.java

@@ -10,5 +10,4 @@ public class Indent {
     private Users userID;//外键，下单用户ID
     private Merchants merchantsID;//外键，餐厅ID
     private Float allPrice;//菜品总价
-
 }

src/main/java/entities/Merchants.java

@@ -8,7 +8,6 @@ public class Merchants {
     private Long id;//商家编号
     private String name;//店铺名字
     private String address;//店铺地址
+    private String description;//店铺描述
     private Indent IndentID;//外键，订单ID
-
-
 }

src/main/java/entities/Users.java

@@ -5,7 +5,7 @@ import lombok.Data;
 //用户类
 @Data
 public class Users {
-    private Long id;
+    private Long id;//用户ID
     private String name;//用户姓名
     private String phoneNumber;//用户联系方式
     private String address;//家庭住址

src/main/java/entities/indentItem.java

@@ -6,6 +6,9 @@ import lombok.Data;
 public class indentItem {
     private Long id;//菜品ID
     private String name;//菜品名字
-    private Float price;//菜品价格
+    private Float initialPrice;//菜品原价
+    private Float discount;//折扣
+    private Float finalPrice;//最终价格
     private String description;//菜品描述
+
 }