hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source 
# Conflicts:
#	src/entities/Profile.ts
This commit is contained in:
Kittapath 2024-05-14 17:29:14 +07:00
commit 09b543763b
19 changed files with 140 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/entities/Profile.ts
View file

@ -4,7 +4,6 @@ import { PosMaster } from "./PosMaster";
import { PosLevel } from "./PosLevel";
import { PosType } from "./PosType";
import { ProfileSalary } from "./ProfileSalary";
import { ProfileDiscipline } from "./ProfileDiscipline";
import { ProfileCertificate } from "./ProfileCertificate";
import { ProfileEducation } from "./ProfileEducation";
import { ProfileTraining } from "./ProfileTraining";
@ -23,6 +22,7 @@ import { SubDistrict } from "./SubDistrict";
import { District } from "./District";
import { ProfileAvatar } from "./ProfileAvatar";
import { ProfileChildren } from "./ProfileChildren";
import { ProfileDiscipline } from "./ProfileDiscipline";
@Entity("profile")
export class Profile extends EntityBase {
@ -268,7 +268,7 @@ export class Profile extends EntityBase {
profileSalary: ProfileSalary[];
@OneToMany(() => ProfileDiscipline, (profileDiscipline) => profileDiscipline.profile)
profileDiscipline: ProfileDiscipline[];
profileDisciplines: ProfileDiscipline[];
@OneToMany(() => ProfileCertificate, (profileCertificate) => profileCertificate.profile)
profileCertificates: ProfileCertificate[];