Merge branch '20172'

# Conflicts:
#	README.md
#	src/main/java/org/example/App.java

src/main/java/entities/Indent.java

@@ -0,0 +1,14 @@
+package entities;
+
+import lombok.Data;
+
+//订单类
+@Data
+public class Indent {
+    private Long id;//订单ID
+    private indentItem indentItemID;//外键，菜品ID
+    private Users userID;//外键，下单用户ID
+    private Merchants merchantsID;//外键，餐厅ID
+    private Float allPrice;//菜品总价
+
+}

src/main/java/entities/Merchants.java

@@ -0,0 +1,14 @@
+package entities;
+
+import lombok.Data;
+
+//商家类
+@Data
+public class Merchants {
+    private Long id;//商家编号
+    private String name;//店铺名字
+    private String address;//店铺地址
+    private Indent IndentID;//外键，订单ID
+
+
+}

src/main/java/entities/Users.java

@@ -0,0 +1,12 @@
+package entities;
+
+import lombok.Data;
+
+//用户类
+@Data
+public class Users {
+    private Long id;
+    private String name;//用户姓名
+    private String phoneNumber;//用户联系方式
+    private String address;//家庭住址
+}

src/main/java/entities/indentItem.java

@@ -0,0 +1,11 @@
+package entities;
+
+import lombok.Data;
+
+@Data
+public class indentItem {
+    private Long id;//菜品ID
+    private String name;//菜品名字
+    private Float price;//菜品价格
+    private String description;//菜品描述
+}

src/main/java/org/example/App.java

@@ -6,7 +6,8 @@ package org.example;
  */
 public class App 
 {
-    public static void main( String[] args ) {
+    public static void main( String[] args )
+    {
         System.out.println( "Hello World!" );
     }
 }