Merge remote-tracking branch 'origin/test_screen' into test_screen

huanghongfa

2021-06-17 aa8159e4e1b5f479043eb596efc8841e33459314

1
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip