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

jiangping

2025-02-08 75ac3d5acdd448f063a3c307b4c733e37b4fc04f

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

@@ -34,9 +34,12 @@
    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "管理员账号（关联system_user表)", example = "1")
    @ApiModelProperty(value = "管理员账号ID（关联system_user表)", example = "1")
    private Integer managerId;

    @ApiModelProperty(value = "管理员账号（关联system_user表)", example = "1")
    private String managerUserName;

    @ApiModelProperty(value = "联系人")
    private String linkname;