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

jiangping

2024-10-17 14b70bacd63f6b136612cf70b160777142e2a996

 server/service/src/main/java/com/doumee/dao/system/dto/CreateCompanyUserDTO.java

@@ -16,7 +16,7 @@


    @ApiModelProperty(value = "用户主键", example = "1")
    private Integer userId;
    private Integer id;

    @ApiModelProperty(value = "账号", example = "1")
    private String userName;