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

935090232@qq.com

2021-05-19 23f5815a2327bde2a5259be3e83909c1aee94105

 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;