Skip to content

Commit

Permalink
perf: merge fix
Browse files Browse the repository at this point in the history
  • Loading branch information
O-Jiangweidong committed Nov 14, 2024
1 parent e1a2c93 commit 7884115
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion apps/jumpserver/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
PROJECT_DIR = os.path.dirname(BASE_DIR)
VERSION = '2.0.0'
VERSION = '3.10.15-lts'
CONFIG = ConfigManager.load_user_config()


2 changes: 1 addition & 1 deletion apps/tickets/models/ticket/general.py
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ def get_next_serial_num(self):
date_created = as_current_tz(self.date_created)
date_prefix = date_created.strftime('%Y%m%d')

ticket = Ticket.objects.filter(
ticket = Ticket.objects.all().select_for_update().filter(
serial_num__startswith=date_prefix
).order_by('-serial_num').first()

Expand Down

0 comments on commit 7884115

Please sign in to comment.