From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java
index d34b1ec..8617405 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java
@@ -1,8 +1,5 @@
package com.ruoyi.system.api.domain.vo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -45,14 +42,29 @@
@ApiModelProperty(value = "商户名称")
private String shopName;
+ @ApiModelProperty(value = "商户编号")
+ private String shopNumber;
+
@ApiModelProperty(value = "商户地址")
private String shopAddress;
@ApiModelProperty(value = "商户电话")
private String shopServicePhone;
+ @ApiModelProperty(value = "员工头像")
+ private String staffAvatar;
+
@ApiModelProperty(value = "商户营业时间")
private String businessTime;
+ /**
+ * 商户类型1.经销商2.代理商
+ */
+ @ApiModelProperty(value = "商户类型1.经销商2.代理商")
+ private Integer shopType;
+
+ @ApiModelProperty(value = "商户二维码地址")
+ private String shopCodeUrl;
+
}
--
Gitblit v1.7.1