youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-28 22:48:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/deploy/dev' into feat/memory-orchestration-be-dev-env

Browse Source 
# Conflicts:
#	api/models/__init__.py
#	api/uv.lock
This commit is contained in:
Stream
2025-10-11 15:01:26 +08:00
parent 61d9428064 c09d205776
commit 1a4600ce77
141 changed files with 11908 additions and 3514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/controllers/console/workspace/workspace.py
View File

@ -51,6 +51,8 @@ tenant_fields = {
"in_trial": fields.Boolean,
"trial_end_reason": fields.String,
"custom_config": fields.Raw(attribute="custom_config"),
"trial_credits": fields.Integer,
"trial_credits_used": fields.Integer,
}
tenants_fields = {