From 45d37a6febb87837a6daa65429703a37e437d257 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 17 七月 2023 19:58:39 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java |    8 +++++++-
 1 files changed, 7 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 a2912c3..95d4645 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
@@ -165,7 +165,7 @@
      * 活动id
      */
     @TableField("activity_id")
-    private Long activityId;
+    private String activityId;
 
     /**
      * 活动名称
@@ -173,6 +173,12 @@
     @TableField("activity_name")
     private String activityName;
 
+    /**
+     * 应收金额
+     */
+    @TableField("change_receivable_money")
+    private BigDecimal changeReceivableMoney;
+
     @Override
     protected Serializable pkVal() {
         return this.orderId;

--
Gitblit v1.7.1