Merge branch 'dev'

app/service/user/user.js

@@ -195,6 +195,7 @@ class UserService extends CrudService {
     const user = await this.model.findById(user_id).lean();
     delete user.meta;
     delete user.__v;
+    if (!user.id) user.id = user_id;
     const token = this.ctx.service.util.jwt.encrypt(user);
     return token;
   }