Merge pull request '解决Bug,#2822,#2820' (#2825) from zouap_static into V20220830