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

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

 screen-api/pom.xml

@@ -16,6 +16,11 @@
            <artifactId>screen-common</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>javax.persistence</groupId>
            <artifactId>persistence-api</artifactId>
            <version>1.0</version>
        </dependency>
    </dependencies>

    <build>