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

k94314517

2023-09-15 64f45c75ea93911b9841bf00bb4c436cd294be3a

 server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyUserDTO.java

@@ -45,8 +45,8 @@
    @ApiModelProperty(value = "企业编码")
    private Integer companyId;

    @ApiModelProperty(value = "企业编码")
    private Integer companyName;
    @ApiModelProperty(value = "企业m名称")
    private String companyName;

    @ApiModelProperty(value = "类型 0平台用户 1企业用户")
    private Integer type;