Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 53s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 53s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org: fix: avatar : string # Conflicts: # src/controllers/ProfileAvatarEmployeeController.ts
This commit is contained in:
commit
3b40c4c659
2 changed files with 4 additions and 4 deletions
|
|
@ -164,8 +164,8 @@ export class ProfileAvatarController extends Controller {
|
|||
where: { id: _record.profileId },
|
||||
});
|
||||
if (profile) {
|
||||
profile.avatar = null;
|
||||
profile.avatarName = null;
|
||||
profile.avatar = '';
|
||||
profile.avatarName = '';
|
||||
await this.profileRepository.save(profile, { data: req });
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,14 +58,14 @@ export class Profile extends EntityBase {
|
|||
comment: "รูปถ่าย",
|
||||
default: null,
|
||||
})
|
||||
avatar: string | null;
|
||||
avatar: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
comment: "รูปถ่าย",
|
||||
default: null,
|
||||
})
|
||||
avatarName: string | null;
|
||||
avatarName: string;
|
||||
|
||||
@Column({
|
||||
nullable: true,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue