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

jiaosong

2023-08-28 a79f7d80e55319ae1a40954f6a4ce6e382cc1649

 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;
}