From 39748c770c83ff1b1e4593c5f24b147361e587c0 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期三, 10 五月 2023 11:16:49 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommandCooperation.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java
similarity index 84%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommandCooperation.java
rename to ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java
index be00f7c..26b597f 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommandCooperation.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java
@@ -8,8 +8,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.Version;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -25,8 +23,8 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@TableName("t_recommand_cooperation")
-public class RecommandCooperation extends Model<RecommandCooperation> {
+@TableName("t_recommend_cooperation")
+public class RecommendCooperation extends Model<RecommendCooperation> {
private static final long serialVersionUID = 1L;
@@ -40,16 +38,19 @@
*/
@TableField("del_flag")
private Integer delFlag;
+
+ @TableField("shop_id")
+ private Long shopId;
/**
- * 签约状态
+ * 签约状态1.未签约2已签约
*/
@TableField("corp_status")
private Integer corpStatus;
/**
* 推荐人id
*/
- @TableField("recommand_user_id")
- private Long recommandUserId;
+ @TableField("recommend_user_id")
+ private Long recommendUserId;
/**
* 被推荐人
*/
--
Gitblit v1.7.1