Merge remote-tracking branch 'origin/master'

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.lyy</groupId>
-    <artifactId>liyeyun-user-web</artifactId>
+    <artifactId>cfld-liyeyun-user-web</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>

src/main/resources/application.yml

@@ -2,7 +2,7 @@
   profiles:
     active: dev
   application:
-    name: liyeyun-user-service
+    name: cfld-liyeyun-user-web
   main:
     allow-bean-definition-overriding: true
   jackson: