Merge branch 'dev' into feat/um-114-roles-and-permissions

This commit is contained in:
Brian Cao 2022-12-01 20:30:46 -08:00
parent 3085bdd713
commit ab9f403448
28 changed files with 345 additions and 412 deletions

View file

@ -36,9 +36,7 @@ export async function getUser(
id: true,
username: true,
userRole: {
include: {
role: true,
},
select: { role: true },
},
password: includePassword,
},