From 8c6be68405cc1a1108aff05d026bab12b7074948 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 15:16:34 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
index 51789a6..3e54505 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
@@ -82,9 +82,9 @@
@TableField("invite_user_id")
private Long inviteUserId;
- @ApiModelProperty(value = "拥有门店id")
+ @ApiModelProperty(value = "绑定门店id")
@TableField("shop_id")
- private Integer shopId;
+ private Long shopId;
@ApiModelProperty(value = "合伙人积分数")
@TableField("part_point")
--
Gitblit v1.7.1