Merge remote-tracking branch 'origin/master'

This commit is contained in:
2023-11-25 08:38:12 +03:00

View File

@@ -26,7 +26,7 @@ def assembly_info():
expand_param = params.get('expand')
order_ids = params.get('orderIds')
expand_list = expand_param if expand_param else []
datetime_format = 'YYYY-MM-DD, HH24:MI'
datetime_format = 'YYYY.MM.DD, HH24:MI'
entity_list = [
database.Assembly.id.label('id'),
database.Assembly.order_id.label('order_id'),