From 0398509aa5f27bd6f987adf3d24eceef56b07b4c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 19:04:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
index ed30191..fb86dcf 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
@@ -83,6 +83,13 @@
*/
@TableField("receivable_money")
private BigDecimal receivableMoney;
+
+ /**
+ * 应收订金
+ */
+ @TableField("receivable_deposit")
+ private BigDecimal receivableDeposit;
+
/**
* 支付类型1.全款2.订金
*/
@@ -138,7 +145,16 @@
*/
@TableField("use_user_id")
private Long useUserId;
-
+ /**
+ * 商品数量
+ */
+ @TableField("goods_num")
+ private Integer goodsNum;
+ /**
+ * 结清标记
+ */
+ @TableField("close_flag")
+ private Integer closeFlag;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1