Merge branch 'dev' into local-slave

# Conflicts:
#	nb-admin/pom.xml
#	nb-admin/src/main/resources/application-dev.yml
#	nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/common/BusDeviceRunningEntity.java
#	nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicAnalRecordResult.java

nb-admin/pom.xml

@@ -135,8 +135,6 @@
                         <layers>
                             <enabled>true</enabled>
                         </layers>
-                        <includeSystemScope>true</includeSystemScope>
-                        <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
                     </configuration>
                     <executions>
                         <execution>