Merge branch 'dev' into prcix9320

This commit is contained in:
zhangshixiang
2026-01-07 15:30:42 +08:00
parent ead43b2bc1
commit e9f1a7bb44
8 changed files with 608 additions and 379 deletions

View File

@@ -418,7 +418,7 @@ def main():
# 如果从远端获取了物料信息,则与本地物料进行同步
if request_startup_json and "nodes" in request_startup_json:
print_status("开始同步远端物料到本地...", "info")
remote_tree_set = ResourceTreeSet.from_raw_list(request_startup_json["nodes"])
remote_tree_set = ResourceTreeSet.from_raw_dict_list(request_startup_json["nodes"])
resource_tree_set.merge_remote_resources(remote_tree_set)
print_status("远端物料同步完成", "info")