Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录

server/svr-authentication/src/main/resources/application.yml

@@ -120,7 +120,7 @@ im:
  im_list_get: http://172.26.0.105:3000/
kick:
    ##互踢 1开通 0关闭
    eachOther: 1
    eachOther: 0
---
spring:
  profiles: jwOracleTest