Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-07-15 8a1e35934f5ad3e3febe6168e8eb990a0cd9cadb

 pom.xml

@@ -12,6 +12,7 @@
        <module>screen-api</module>
        <module>myBatisPlusGenerator</module>
        <module>screen-manage</module>
        <module>screen-job</module>

    </modules>
    <packaging>pom</packaging>