Merge remote-tracking branch 'origin/master'

# Conflicts:
#	data-service/src/main/java/com/dingzhuo/energy/dataservice/data/InfluxDb.java