Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 0649fb5e05730a8f8bf15b0fe019a7227361f1af

 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;