From 65ca63cc3d36f23d285a7d944fcc0d6bac92430d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 14:41:42 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
index e26f4c3..5416f94 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
@@ -163,6 +163,14 @@
@TableField("belong_district")
private String belongDistrict;
+ @TableField("frozen_flag")
+ private Integer frozenFlag;
+
+ /**
+ * 绑定类型1商城订单2活动订单3线下订单4核销优惠券5核销奖品6商户创建7平台变动
+ */
+ @TableField("binding_type")
+ private Integer bindingType;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1