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

houruijun

2020-08-07 98fb4b2802f949a730b87f55a8d100272817ac3e

 kidgrow-web/kidgrow-web-sso/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
#Generated by Maven
#Fri Mar 13 08:48:59 CST 2020
#Wed Mar 18 19:02:44 CST 2020
version=1.0
groupId=com.kidgrow
artifactId=kidgrow-web-sso