Merge remote-tracking branch 'origin/main'

src/main/java/com/gxwebsoft/oa/entity/OaCompany.java

@@ -45,6 +45,9 @@ public class OaCompany implements Serializable {
     @Schema(description = "上级单位/集团公司/归属单位")
     private String parentCompany;
 
+    @Schema(description = "上级单位/集团公司/归属单位ID")
+    private Integer parentCompanyId;
+
     @Schema(description = "类型 10企业 20政府单位")
     private String companyType;