解决冲突

jiangping

2023-09-14 cf9b836069e0a76571c6611642b2d7abb0586a2b

 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;