Merge remote-tracking branch 'origin/huangzqa-fixVersion-20210119' into huangzqa-fixVersion-20210119

# Conflicts:
#	pom.xml

pom.xml

@@ -14,9 +14,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <!--revisions需写死，用于标识打包的版本号，不可删除-->
-        <revision>2.0.0-SNAPSHOT</revision>
-        <duceap.version>2.1.0-SNAPSHOT</duceap.version>
         <lombok.version>1.18.2</lombok.version>
     </properties>
 

src/main/assembly/conf/application.yml

@@ -72,5 +72,5 @@ ribbon:
   ConnectTimeout: 30000
 dcuc:
   userweb:
-    app-code: YHZX0000000000000001
+    app-code: QXXT0000000000000001
     auth-access: false