Skip to content

Commit

Permalink
Merge pull request #654 from veops/fix_acl_date_joined_column
Browse files Browse the repository at this point in the history
fix: acl user date_joined timezone
  • Loading branch information
simontigers authored Dec 16, 2024
2 parents 1c5d2c8 + ea4ea9d commit d1e40b4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cmdb-api/api/models/acl.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ class User(CRUDModel, SoftDeleteMixin):
_password = db.Column("password", db.String(80))
key = db.Column(db.String(32), nullable=False)
secret = db.Column(db.String(32), nullable=False)
date_joined = db.Column(db.DateTime, default=datetime.utcnow)
last_login = db.Column(db.DateTime, default=datetime.utcnow)
date_joined = db.Column(db.DateTime, default=datetime.now)
last_login = db.Column(db.DateTime, default=datetime.now)
block = db.Column(db.Boolean, default=False)
has_logined = db.Column(db.Boolean, default=False)
wx_id = db.Column(db.String(32))
Expand Down

0 comments on commit d1e40b4

Please sign in to comment.