Merge branch 'dev_6.8.4_order' into test6.8.4

@@ -19,4 +19,9 @@ public class UfoServiceException extends RuntimeException {
     public String getErrorMessage() {
         return errorMessage;
     }
+
+    @Override
+    public String getMessage() {
+        return "[" + this.code + ":" + this.errorMessage + "]";
+    }
 }