Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-30 44a808c60ee7168fda4ca0100ef793045d8b2a60

 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;