Merge remote-tracking branch 'base-version/main' into dev

2025-11-13 21:40:08 +08:00
parent 2eb09ff35d af7f103a38
commit 53a0293b7c
5 changed files with 33 additions and 40 deletions
--- a/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java
+++ b/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java
@@ -11,7 +11,7 @@ public class CompanyDeptInfo {
    /**
     * 公司Id
     */
-    private Long companyId;
+    private String companyId;
    /**
     * 公司名称
     */
@@ -19,7 +19,7 @@ public class CompanyDeptInfo {
    /**
     * 部门Id
     */
-    private Long deptId;
+    private String deptId;
    /**
     * 部门名称
     */