From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyDetailOrder.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyDetailOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyDetailOrder.java
index 776c46c..d56cb8d 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyDetailOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyDetailOrder.java
@@ -22,8 +22,8 @@
@TableId(type = IdType.INPUT, value = "id")
private Integer id;
@ApiModelProperty(value = "策略id")
- @TableField("accounting_strategy_order_id")
- private Integer accountingStrategyOrderId;
+ @TableField("accounting_strategy_id")
+ private Integer accountingStrategyId;
@ApiModelProperty(value = "阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）")
@TableField("type")
--
Gitblit v1.7.1