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

李宇

2020-11-24 f34c966b68f73f0335fef19dcb31e4d23860d13a

 pom.xml

@@ -452,6 +452,18 @@
        <profile.active>szygs</profile.active>
      </properties>
    </profile>
    <profile>
      <id>zkysh</id>
      <properties>
        <profile.active>zkysh</profile.active>
      </properties>
    </profile>
    <profile>
      <id>shgjs</id>
      <properties>
        <profile.active>shgjs</profile.active>
      </properties>
    </profile>
  </profiles>
  <build>
    <finalName>smartlab</finalName>