Merge branch 'dev-sensitive-20191112' into dev-agreement-sensitive

# Conflicts:
#	server/src/main/java/com/pica/cloud/account/account/server/job/AccountRepeatDataJob.java
#	server/src/main/java/com/pica/cloud/account/account/server/mapper/AccountInfoDetailMapper.java
#	server/src/main/java/com/pica/cloud/account/account/server/util/AESUtil.java
#	server/src/main/resources/bootstrap-prod.properties
#	server/src/main/resources/bootstrap-test1.properties
#	server/src/main/resources/bootstrap-uat.properties
#	server/src/main/resources/mybatis/DoctorMapper.xml