Merge branch 'develop' into adiDev

2024-05-09 11:08:39 +07:00 · 2024-05-09 11:08:39 +07:00 · 98a28db920
commit 98a28db920
parent 29234e7a3b aa32b573e0
4 changed files with 102 additions and 65 deletions
--- a/src/entities/kpiUserEvaluation.ts
+++ b/src/entities/kpiUserEvaluation.ts
@ -85,10 +85,12 @@ export class KpiUserEvaluation extends EntityBase {
  evaluationResults: string;

  @Column({
+    nullable: true,
+    length: 40,
    comment: "คำขอแก้ไข",
-    default: false,
+    default: null,
  })
-  isReqEdit: boolean;
+  evaluationReqEdit: string;

  @Column({
    type: "double",