From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
index 4be2b7c..9a59b64 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
@@ -197,12 +197,9 @@
@ApiModelProperty("再投数量")
@TableField(exist = false)
private Integer reInvestment=0;
-
-
-
-
-
-
+ @ApiModelProperty("待预约数量")
+ @TableField(exist = false)
+ private Integer pending=0;
@ApiModelProperty("是否为再投单")
@TableField("is_reinvest")
--
Gitblit v1.7.1