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

liuleilei

2023-09-11 faf1d3cc35a3a5f83558946c8056537a4d77fa1f

 server/src/main/java/doumeemes/dao/ext/vo/CompanyInfoListVO.java

@@ -55,6 +55,8 @@

    @ApiModelProperty(value = "销售人员")
    private Integer salesperson;
    @ApiModelProperty(value = "开通用户数")
    private Integer openUserNum;

    @ApiModelProperty(value = "销售人员")
    private String salespersonName;