From 4c6d6ff48364eb56a7d61ca0877fd98f1ff9b447 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 02 十二月 2024 10:38:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUserShop.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUserShop.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUserShop.java
index 088262f..c43a629 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUserShop.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUserShop.java
@@ -1,27 +1,31 @@
package com.ruoyi.account.api.model;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-
+/**
+ * @author zhibing.pu
+ * @Date 2024/12/2 9:18
+ */
@Data
-@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_shop")
-@ApiModel(value="AppUser对象", description="")
-public class AppUserShop implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- private Long appUserId;
-
- private Long shopId;
+public class AppUserShop {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户id
+ */
+ @TableField("app_user_id")
+ private Long appUserId;
+ /**
+ * 门店id
+ */
+ @TableField("shop_id")
+ private Integer shopId;
}
--
Gitblit v1.7.1