Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 kidgrow-web/kidgrow-web-manager/pom.xml

@@ -83,7 +83,7 @@
                    <dockerfile>Dockerfile</dockerfile>
                    <repository>${docker.repostory}/${docker.image.prefix}/${project.artifactId}</repository>
                    <!-- 生成镜像标签 如不指定 默认为latest -->
                    <tag>1.0.1</tag>
                    <tag>1.0.5</tag>
                    <!--<tag>${project.version}</tag>-->
                    <buildArgs>
                        <JAR_FILE>./target/${project.build.finalName}.jar</JAR_FILE>