Merge branch '20172'

This commit is contained in:
twinkle255 2023-03-26 22:16:54 +08:00
commit cd77c9c598
4 changed files with 7 additions and 6 deletions

View File

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

View File

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

View File

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

View File

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