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

jiaosong

2023-08-28 a79f7d80e55319ae1a40954f6a4ce6e382cc1649

 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;