From 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 07 Apr 2021 11:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanVo.java
index e85f7ca..02d7fbb 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanVo.java
@@ -17,7 +17,7 @@
 
 
     @ApiModelProperty(value = "手机号码")
-    private String  phoneNumber;
+    private String  phone;
 
     @ApiModelProperty(value = "贡献订单数")
     private String  orderCount;

--
Gitblit v1.9.1