Merge remote-tracking branch 'origin/develop' into dev/mix20191225_security

# Conflicts:
#	aipt-service/src/main/java/com/diagbot/facade/PushFacade.java

aipt-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -60,7 +60,7 @@ public class PushFacade {
 
         try {
             Map<String, Object> invokeParams = new HashMap<>();
-            invokeParams.put("pushDTO", pushDTO);
+            invokeParams.put("pushDTO",pushDTO);
             invokeParams.put("featureTypeSet", featureTypeSet);
             invokeParams.put("data", data);
             invokeParams.put("isConnect", isConnect);