From 4b2c48677c2b5de7f89ff0d018a55b7916467b27 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 22 四月 2025 17:29:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou 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