Merge remote-tracking branch 'origin/master'

liyong

3 天以前 f02b5af51f2fcfaae5b04e4c12078ec0da578f7e

 pom.xml

@@ -288,14 +288,6 @@
                   <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->

               </configuration>

           </plugin>

            <plugin>

                <groupId>org.apache.maven.plugins</groupId>

                <artifactId>maven-compiler-plugin</artifactId>

                <configuration>

                    <source>10</source>

                    <target>10</target>

                </configuration>

            </plugin>

        </plugins>

   </build>