Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

cnf

2025-05-09 af3455bc13c0ed48f4e3fa1b1614f601df24f12c

 StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs

@@ -147,7 +147,8 @@
            ParentId = Convert.ToDecimal(department.FParentID),
            FDOCUMENTSTATUS = department.FDocumentStatus,
            Company = "1000",
            Factory = "1000"
            Factory = "1000",
            Type=department.Type,
        };
    }