Merge origin/master: resolve conflicts, keep RBAC and fixes

Made-with: Cursor
2026-03-04 19:31:34 +04:00
parent 8edeaf10f5 69d3d21487
commit ae890ca1c5
2 changed files with 35 additions and 1 deletions
--- a/backend/prisma/schema.prisma
+++ b/backend/prisma/schema.prisma
@@ -131,7 +131,7 @@ model Employee {
  lastName          String
  firstNameAr       String?
  lastNameAr        String?
-  email             String    @unique
+  email             String   
  phone             String?
  mobile            String
  dateOfBirth       DateTime?