From b0b94a084ed6c1a685caebb8dfb1a0d65fdd9ef6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 10:57:42 +0800
Subject: [PATCH] 提交

---
 server/service/src/main/java/com/doumee/dao/business/model/Users.java |   49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 45 insertions(+), 4 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 1161564..962847e 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;
@@ -133,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 = "瀹d紶璇�")
@@ -144,6 +145,18 @@
     @ApiModelProperty(value = "涓汉浜岀淮鐮佸浘鐗囧湴鍧�")
     @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="閭")
@@ -157,8 +170,36 @@
     @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 companyQrcodeImgFull;
 
 }

--
Gitblit v1.9.3