Merge remote-tracking branch 'origin/master'

jiangping

2023-12-15 b111c48e3c4608c82ddaaa9c5c976674a1faa3d9

 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;


}