From 20b11236b4364034f52df294b9240776f539ede1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 16 七月 2024 14:49:01 +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 | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 54c9563..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
@@ -134,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 = "瀹ｄ紶璇�")
@@ -145,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="閭")
@@ -179,7 +191,15 @@
@ApiModelProperty(value = "瀹屾暣澶村儚褰�")
@TableField(exist = false)
private String imgurlFull;
- @ApiModelProperty(value = "涓汉浜岀淮鐮佸浘鐗囧湴鍧�")
+ @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