From 2f38b2341e1572502fd6b4510670107f57ed261c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期五, 18 八月 2023 23:05:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java | 3 ++-
1 files changed, 2 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 989adcd..688955d 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;
/**
* 活动名称
@@ -179,6 +179,7 @@
@TableField("change_receivable_money")
private BigDecimal changeReceivableMoney;
+
@Override
protected Serializable pkVal() {
return this.orderId;
--
Gitblit v1.7.1