Merge branch 'development' into 'devops-staging'

fix user

See merge request empatnusabangsa/ppob/ppob-backend!107

src/users/users.service.ts

@@ -575,6 +575,7 @@ export class UsersService {
       if (status == 'approved') {
         if (supervisorUser.roles.name == 'Admin') {
           dataUser.status_approval = 'Done';
+          dataUser.is_active = true;
         }else {
           dataUser.status_approval = supervisorUser.superior.id;
         }