From c2d38efe0c2516295abb968442ef765e3da9544d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期二, 09 五月 2023 18:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 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
new file mode 100644
index 0000000..d34b1ec
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java
@@ -0,0 +1,58 @@
+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;
+
+/**
+ * @author jqs34
+ * @ClassName MerStaffInfoVo
+ * @description: TODO
+ * @date 2023年05月09日
+ * @version: 1.0
+ */
+@Data
+public class MerStaffInfoVo {
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+    /**
+     * 员工姓名
+     */
+    @ApiModelProperty(value = "员工姓名")
+    private String staffName;
+    /**
+     * 员工电话
+     */
+    @ApiModelProperty(value = "员工电话")
+    private String staffMobile;
+    /**
+     * 员工性别
+     */
+    @ApiModelProperty(value = "员工性别")
+    private Integer staffGender;
+    /**
+     * 员工生日
+     */
+    @ApiModelProperty(value = "员工生日")
+    private String staffBirthday;
+
+    @ApiModelProperty(value = "商户名称")
+    private String shopName;
+
+    @ApiModelProperty(value = "商户地址")
+    private String shopAddress;
+
+    @ApiModelProperty(value = "商户电话")
+    private String shopServicePhone;
+
+
+    @ApiModelProperty(value = "商户营业时间")
+    private String businessTime;
+
+}

--
Gitblit v1.7.1