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

liuleilei

2023-09-11 faf1d3cc35a3a5f83558946c8056537a4d77fa1f

 server/src/main/java/doumeemes/dao/business/dto/CompanyInitDataDTO.java

@@ -59,5 +59,6 @@

    @ApiModelProperty(value = "销售人员 （关联system_user表，平台管理员类用户）", example = "1")
    private Integer salesperson;

    @ApiModelProperty(value = "当前开通用户数", example = "1")
    private Integer openUserNum;
}