Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

 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;