Merge branch 'master' into 'DEV/Akbar/master-h3-slave'

# Conflicts:
#   src/main/resources/application-dev.properties

src/main/resources/application-dev.properties

@@ -13,7 +13,9 @@ spring.jpa.properties.hibernate.format_sql=true
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
-ddms.h3.service.slave           = ${DDMS_H2_SERVICE_SLAVE:http://localhost:8081/}
+dam.gigr.h3                     = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
+dam.masterdata.h3               = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
+#dam.receipt.query              = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
 dam.receipt.command             = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
 
 # KAFKA

src/main/resources/application-prod.properties

@@ -15,7 +15,7 @@ logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
 dam.gigr.h3                     = ${DAM_GIGR_H3:https://api-uat-b.eksad.com/gigr-h3/}
 dam.masterdata.h3               = ${DAM_MASTERDATA_H3:https://api-uat-b.eksad.com/masterdata-h3/}
-dam.receipt.query            = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
+#dam.receipt.query              = ${DAM_RECEIPT_QUERY_H3:https://api-uat-b.eksad.com/receipt-query/}
 dam.receipt.command             = ${DAM_RECEIPT_COMMAND_H3:https://api-uat-b.eksad.com/receipt-command/}
 
 # KAFKA