Merge branch 'main' of https://bdgit.educoder.net/phtopay94/RealTime_ScreenScanning_TranslationSoftware
# Conflicts: # W1H/用例图.png # W1H/软件系统的需求构思及描述.docx # W1H/顺序图1.png # W1H/顺序图2.png220340121ZGX
commit
858834272c