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

侯瑞军

2020-04-03 f57c1111d78b3442b2a9e2eaea255157cdcb9574

 pom.xml

@@ -156,6 +156,7 @@
            <version>${javax.activatio.version}</version>
        </dependency>
        <!-- jaxb模块引用 - end -->

    </dependencies>

    <dependencyManagement>
@@ -228,6 +229,21 @@
            </dependency>
            <dependency>
                <groupId>com.kidgrow</groupId>
                <artifactId>kidgrow-opration-center-api</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.kidgrow</groupId>
                <artifactId>kidgrow-opration-center-biz</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.kidgrow</groupId>
                <artifactId>kidgrow-opration-center-server</artifactId>
                <version>${project.version}</version>
            </dependency>
            <dependency>
                <groupId>com.kidgrow</groupId>
                <artifactId>kidgrow-uaa-api</artifactId>
                <version>${project.version}</version>
            </dependency>