From 1798c91f6b0782d1970a8a4fdcaf4a174e68cb61 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 16 五月 2023 10:45:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
index 34c37a4..c0285b6 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
@@ -47,4 +47,12 @@
     private Integer wechatAuthorization;
     @ApiModelProperty("客服电话")
     private String serviceCalls;
+    @ApiModelProperty("商户号")
+    private String merchantNumber;
+    @ApiModelProperty("商户姓名")
+    private String merchantName;
+    @ApiModelProperty("商户电话")
+    private String merchantPhone;
+    @ApiModelProperty("商户身份证号码")
+    private String merchantIDCode;
 }

--
Gitblit v1.7.1