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

liuleilei

2023-09-11 faf1d3cc35a3a5f83558946c8056537a4d77fa1f

 server/src/main/java/doumeemes/dao/business/model/Company.java

@@ -175,4 +175,7 @@
    @TableField(exist = false)
    private Department rootDepartment;

    @ApiModelProperty(value = "",hidden = true)
    @TableField(exist = false)
    private int isNew;
}