From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java
index 4054540..105bd58 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java
@@ -22,6 +22,9 @@
@ApiModelProperty(value = "头像", example = "--")
private String photo;
+ @ApiModelProperty(value = "门店名称")
+ private String shopName;
+
public Long getId() {
return id;
}
@@ -53,4 +56,12 @@
public void setPhoto(String photo) {
this.photo = photo;
}
+
+ public String getShopName() {
+ return shopName;
+ }
+
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
}
--
Gitblit v1.9.1