From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/dao/business/model/Users.java | 84 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 73 insertions(+), 11 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..c17cb75 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鍚敤锛�-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="鏈�杩戠櫥褰曟椂闂�")
@@ -130,8 +134,8 @@
@ExcelColumn(name="鏈嶅姟瀹㈡埛鏁�")
private Integer costomerNum;
- @ApiModelProperty(value = "浠庝笟骞存湀(yyyy-MM)")
- @ExcelColumn(name="浠庝笟骞存湀(yyyy-MM)")
+ @ApiModelProperty(value = "浠庝笟骞翠唤")
+ @ExcelColumn(name="浠庝笟骞存湀")
private String jobDate;
@ApiModelProperty(value = "瀹ｄ紶璇�")
@@ -142,9 +146,24 @@
@ExcelColumn(name="涓汉浜岀淮鐮佸浘鐗囧湴鍧�")
private String qrcodeImg;
+ @ApiModelProperty(value = "浼佷笟浜岀淮鐮佸浘鐗囧湴鍧�")
+ @ExcelColumn(name="浼佷笟浜岀淮鐮佸浘鐗囧湴鍧�")
+ private String companyQrcodeImg;
+
+ @ApiModelProperty(value = "涓彴涓存椂绁ㄦ嵁杩囨湡鏃堕棿")
+ @ExcelColumn(name="涓彴涓存椂绁ㄦ嵁杩囨湡鏃堕棿")
+ private Date tokenDate;
+
+ @ApiModelProperty(value = "涓彴涓存椂绁ㄦ嵁")
+ @ExcelColumn(name="涓彴涓存椂绁ㄦ嵁")
+ private String token;
+
@ApiModelProperty(value = "閭")
@ExcelColumn(name="閭")
private String email;
+ @ApiModelProperty(value = "鍚嶇墖")
+ @ExcelColumn(name="鍚嶇墖")
+ private String cardImg;
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛屽尯鍒咹R鍐呴儴鍛樺伐鍜屽姞鐩熷晢鍛樺伐锛�10001鍔犵洘鍟嗭紝10002HR鍐呴儴鍛樺伐锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
@ExcelColumn(name="鐢ㄦ埛绫诲瀷锛屽尯鍒咹R鍐呴儴鍛樺伐鍜屽姞鐩熷晢鍛樺伐锛�10001鍔犵洘鍟嗭紝10002HR鍐呴儴鍛樺伐锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
@@ -154,8 +173,51 @@
@ExcelColumn(name="鐢ㄦ埛瑙掕壊缂栫爜闆嗗悎锛屽涓敤鑻辫閫楀彿闅斿紑")
private String roleIds;
- @ApiModelProperty(value = "鐢ㄦ埛瑙掕壊鍚嶇О闆嗗悎锛屽涓敤鑻辫閫楀彿闅斿紑")
- @ExcelColumn(name="鐢ㄦ埛瑙掕壊鍚嶇О闆嗗悎锛屽涓敤鑻辫閫楀彿闅斿紑")
+ @ApiModelProperty(value = "鐢ㄦ埛瑙掕壊鍚嶇О闆嗗悎")
+ @ExcelColumn(name="鐢ㄦ埛瑙掕壊鍚嶇О闆嗗悎")
private String roleNames;
+ @ApiModelProperty(value = "鐢ㄦ埛瑙掕壊code闆嗗悎锛屽涓敤鑻辫閫楀彿闅斿紑")
+ @ExcelColumn(name="鐢ㄦ埛瑙掕壊code闆嗗悎锛屽涓敤鑻辫閫楀彿闅斿紑")
+ private String roleCodes;
+ @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;
+ @ApiModelProperty(value = "闂ㄥ簵鍦板潃")
+ @TableField(exist = false)
+ private String shopAddress;
+ @ApiModelProperty(value = "闂ㄥ簵鍩庡競")
+ @TableField(exist = false)
+ private String shopCity;
+ @ApiModelProperty(value = "鏄惁鍙鐞嗛棬搴�")
+ @TableField(exist = false)
+ private Boolean manageShop;
+
+ @ApiModelProperty(value = "C绔敤鎴锋墜鏈哄彿",notes = "鐢ㄤ簬鏌ヨ鐢ㄦ埛缁戝畾鐨勫璐�",hidden = true)
+ @TableField(exist = false)
+ private String memberPhone;
+
+ @ApiModelProperty(value = "C绔敤鎴蜂富閿�",notes = "鐢ㄤ簬鏌ヨ鐢ㄦ埛缁戝畾鐨勫璐�",hidden = true)
+ @TableField(exist = false)
+ private Long memberId;
+
+
+ @ApiModelProperty(value = "浼佷笟浜岀淮鐮佸浘鐗囧畬鏁村湴鍧�")
+ @TableField(exist = false)
+ private String companyQrcodeImgFull;
}
--
Gitblit v1.9.3