From c8c0f4c93862bf18f804dcdc017ea7affc09bc90 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 21 十一月 2024 14:38:02 +0800
Subject: [PATCH] 11.21

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java |  199 ++++++++++++++++++++++++-------------------------
 1 files changed, 99 insertions(+), 100 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 4fe1856..0837295 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
@@ -1,115 +1,114 @@
 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.TableLogic;
 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;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
- * 用户
- * @author zhibing.pu
- * @Date 2024/11/21 9:25
+ * <p>
+ * 
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-11-21
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 @TableName("t_app_user")
-public class AppUser {
-	/**
-	 * 主键
-	 */
-	@TableId(value = "id", type = IdType.NONE)
-	private Long id;
-	/**
-	 * 用户名
-	 */
-	@TableField("name")
-	private String name;
-	/**
-	 * 手机号
-	 */
-	@TableField("phone")
-	private String phone;
-	/**
-	 * 头像
-	 */
-	@TableField("avatar")
-	private String avatar;
-	/**
-	 * 会员id
-	 */
-	@TableField("vip_id")
-	private Integer vipId;
-	/**
-	 * 微信openid
-	 */
-	@TableField("wx_openid")
-	private String wxOpenid;
-	/**
-	 * 状态(1=正常,2=冻结,3=注销)
-	 */
-	@TableField("status")
-	private Integer status;
-	/**
-	 * 添加时间
-	 */
-	@TableField("create_time")
-	private LocalDateTime createTime;
-	/**
-	 * 删除(0=否,1=是)
-	 */
-	@TableField("del_flag")
-	private Integer delFlag;
-	/**
-	 * 0否1是第一次添加
-	 */
-	@TableField("first_add")
-	private Integer firstAdd;
-	/**
-	 * 最后一次登录时间
-	 */
-	@TableField("last_login_time")
-	private LocalDateTime lastLoginTime;
-	/**
-	 * 推广人id
-	 */
-	@TableField("invite_user_id")
-	private Long inviteUserId;
-	/**
-	 * 拥有门店id
-	 */
-	@TableField("shop_id")
-	private Integer shopId;
-	/**
-	 * 合伙人积分数
-	 */
-	@TableField("part_point")
-	private Integer partPoint;
-	/**
-	 * 合伙人培育积分数
-	 */
-	@TableField("part_grow_point")
-	private Integer partGrowPoint;
-	/**
-	 * 消费积分数
-	 */
-	@TableField("shop_point")
-	private Integer shopPoint;
-	/**
-	 * 返佣积分数
-	 */
-	@TableField("share_point")
-	private Integer sharePoint;
-	/**
-	 * 消费总金额
-	 */
-	@TableField("shop_amount")
-	private BigDecimal shopAmount;
-	/**
-	 * 最后消费时间
-	 */
-	@TableField("last_shop_time")
-	private LocalDateTime lastShopTime;
+@ApiModel(value="AppUser对象", description="")
+public class AppUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("id")
+    private Long id;
+
+    @ApiModelProperty(value = "用户")
+    @TableField("name")
+    private String name;
+
+    @ApiModelProperty(value = "手机号")
+    @TableField("phone")
+    private String phone;
+
+    @ApiModelProperty(value = "头像")
+    @TableField("avatar")
+    private String avatar;
+
+    @ApiModelProperty(value = "会员id")
+    @TableField("vip_id")
+    private Integer vipId;
+
+    @ApiModelProperty(value = "微信openid")
+    @TableField("wx_openid")
+    private String wxOpenid;
+
+    @ApiModelProperty(value = "支付宝openid")
+    @TableField("ali_openid")
+    private String aliOpenid;
+
+    @ApiModelProperty(value = "状态(1=正常,2=冻结,3=注销)")
+    @TableField("status")
+    private Integer status;
+
+    @ApiModelProperty(value = "添加时间")
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "删除(0=否,1=是)")
+    @TableField("del_flag")
+    @TableLogic
+    private Boolean delFlag;
+
+    @ApiModelProperty(value = "0否1是第一次添加")
+    @TableField("first_add")
+    private Integer firstAdd;
+
+    @ApiModelProperty(value = "最后一次登录时间")
+    @TableField("last_login_time")
+    private LocalDateTime lastLoginTime;
+
+    @ApiModelProperty(value = "推广人id")
+    @TableField("invite_user_id")
+    private Long inviteUserId;
+
+    @ApiModelProperty(value = "拥有门店id")
+    @TableField("shop_id")
+    private Integer shopId;
+
+    @ApiModelProperty(value = "合伙人积分数")
+    @TableField("part_point")
+    private BigDecimal partPoint;
+
+    @ApiModelProperty(value = "合伙人培育积分数")
+    @TableField("part_grow_point")
+    private BigDecimal partGrowPoint;
+
+    @ApiModelProperty(value = "消费积分数")
+    @TableField("shop_point")
+    private BigDecimal shopPoint;
+
+    @ApiModelProperty(value = "返佣积分数")
+    @TableField("share_point")
+    private BigDecimal sharePoint;
+
+    @ApiModelProperty(value = "消费总金额")
+    @TableField("shop_amount")
+    private BigDecimal shopAmount;
+
+    @ApiModelProperty(value = "最后消费时间")
+    @TableField("last_shop_time")
+    private LocalDateTime lastShopTime;
+
+
 }

--
Gitblit v1.7.1