Merge remote-tracking branch 'origin/master'

lishuai

2023-12-15 3a86c9c6879971051ab1e01a5b9b88eed27e55db

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java

@@ -167,6 +167,9 @@
    @ApiModelProperty(value = "上级组织名称")
    @TableField(exist = false)
    private String parentName;
    @ApiModelProperty(value = "海康上级组织")
    @TableField(exist = false)
    private String hkParentId;


}