From 4146ce356365a67fec0509d64ebcf52f74c7ade9 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 27 九月 2023 11:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
index a636b6d..bb20553 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
@@ -163,8 +163,8 @@
*/
@TableField("shelves")
private Integer shelves;
- @TableField("cardTye")
- private Integer cardTye;
+ @TableField("cardType")
+ private Integer cardType;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1