|
|
@@ -15,7 +15,6 @@ class User(Model):
|
|
|
is_superuser = fields.IntField(description="超級使用者")
|
|
|
is_gmail = fields.IntField(description="是否使用gmail登入")
|
|
|
token = fields.CharField(max_length=200)
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
|
class UserPydantic(BaseModel):
|
|
|
id: int
|
|
|
@@ -28,8 +27,6 @@ class UserPydantic(BaseModel):
|
|
|
token: str
|
|
|
class Config:
|
|
|
orm_mode = True
|
|
|
-=======
|
|
|
->>>>>>> 097c59d02ac3490bfce014d7f28b0049719ef7ac
|
|
|
|
|
|
class UserPydantic(BaseModel):
|
|
|
id: int
|
