From a17335c7cddc86ffe70d423e7e6e7456b1d6c93a Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期二, 10 十二月 2024 15:15:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 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 47ea3b0..9d92ba2 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 @@ -202,6 +202,9 @@ @ApiModelProperty(value = "区编号") @TableField("district_code") private String districtCode; + @ApiModelProperty(value = "区编号") + @TableField("qr_code") + private String qrCode; @ApiModelProperty("等级1会员数") @TableField(exist = false) @@ -231,6 +234,10 @@ @TableField(exist = false) private Long count7; + @ApiModelProperty("是否签到1是0否") + @TableField(exist = false) + private Integer isSign; + -- Gitblit v1.7.1