From a52f8c508d08014d1a153cfc02e12b5fc185a3a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 15:28:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/Users.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Users.java b/server/service/src/main/java/com/doumee/dao/business/model/Users.java
index 80b0bac..0fd7ea5 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Users.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Users.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.business.dto.BaseQueryDto;
import io.swagger.annotations.ApiModel;
@@ -52,11 +53,14 @@
@ApiModelProperty(value = "鎵�灞為棬搴楃紪鐮�(鍏宠仈shop琛�)", example = "1")
@ExcelColumn(name="鎵�灞為棬搴楃紪鐮�(鍏宠仈shop琛�)")
- private Integer departmentId;
+ private Long departmentId;
@ApiModelProperty(value = "澶村儚")
@ExcelColumn(name="澶村儚")
private String imgurl;
+ @ApiModelProperty(value = "iam缁勭粐缂栫爜")
+ @ExcelColumn(name="iam缁勭粐缂栫爜")
+ private String iamOrgId;
@ApiModelProperty(value = "绫诲瀷 0鍛樺伐", example = "1")
@ExcelColumn(name="绫诲瀷 0鍛樺伐")
@@ -86,9 +90,9 @@
@ExcelColumn(name="寰俊openid")
private String openid;
- @ApiModelProperty(value = "鐘舵��", example = "1")
- @ExcelColumn(name="鐘舵��")
- private Integer status;
+ @ApiModelProperty(value = "璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤", example = "1")
+ @ExcelColumn(name="璐︽埛鐘舵�� 0鍋滅敤锛�1鍚敤")
+ private String status;
@ApiModelProperty(value = "鍚屾鐘舵��", example = "1")
@ExcelColumn(name="鍚屾鐘舵��")
@@ -110,9 +114,9 @@
@ExcelColumn(name="鐧诲綍瀵嗙爜")
private String password;
- @ApiModelProperty(value = "鎬у埆 1鐢� 2濂�", example = "1")
- @ExcelColumn(name="鎬у埆 1鐢� 2濂�")
- private Integer sex;
+ @ApiModelProperty(value = "鎬у埆 0鐢� 1濂�", example = "1")
+ @ExcelColumn(name="鎬у埆 0鐢� 1濂�")
+ private String sex;
@ApiModelProperty(value = "鏈�杩戠櫥褰曟椂闂�")
@ExcelColumn(name="鏈�杩戠櫥褰曟椂闂�")
@@ -157,5 +161,22 @@
@ApiModelProperty(value = "鐢ㄦ埛瑙掕壊鍚嶇О闆嗗悎锛屽涓敤鑻辫閫楀彿闅斿紑")
@ExcelColumn(name="鐢ㄦ埛瑙掕壊鍚嶇О闆嗗悎锛屽涓敤鑻辫閫楀彿闅斿紑")
private String roleNames;
-
+ @ApiModelProperty(value = "鏄惁鍖呭惈涓嬬骇")
+ @TableField(exist = false)
+ private Boolean includeChild;
+ @ApiModelProperty(value = "鎵�灞炵粍缁囧悕绉�")
+ @TableField(exist = false)
+ private String shopName;
+ @ApiModelProperty(value = "缁勭粐绫诲瀷")
+ @TableField(exist = false)
+ private Integer shopType;
+ @ApiModelProperty(value = "缁勭粐绫诲瀷浜岀骇")
+ @TableField(exist = false)
+ private Integer shopSecType;
+ @ApiModelProperty(value = "瀹屾暣澶村儚褰�")
+ @TableField(exist = false)
+ private String imgurlFull;
+ @ApiModelProperty(value = "涓汉浜岀淮鐮佸浘鐗囧湴鍧�")
+ @TableField(exist = false)
+ private String qrcodeImgFull;
}
--
Gitblit v1.9.3