Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	src/main/resources/mapper/ReceiptMapper.xml

src/main/resources/mapper/ReceiptMapper.xml

@@ -380,7 +380,7 @@
                         cdr.cancelReason,
                         cdr.confirmType,
                         cdr.reviewReason,
-                        ifnull(cdr.newReceiptType,2) as newReceiptType,
+                        IFNULL(cdr.newReceiptType,2) AS newReceiptType,
                         cdr.shopName,
                         receiptUserPermissionID AS receiptUserPermissionId,
                         confirmUserPermissionID AS confirmUserPermissionId,