Merge branch 'ty_fix' into alpha

Helius

2021-11-12 babccfd39f2bd712b957d6e46d32f32acd483d4c

 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;