Merge branch 'ljgc-server' of http://218.76.0.69:3000/lmp/lmp_server into ljgc-server

Conflicts:
	application-webadmin/src/main/resources/application-dev.yml

application-webadmin/src/main/resources/application.yml

@@ -44,7 +44,7 @@ spring:
     allow-circular-references: true
   data:
     mongodb:
-      uri: mongodb://127.0.0.1:27017
+      uri: mongodb://root:123456@192.168.0.36:27017/
       database: imp
       authentication-database: admin
       auto-index-creation: true