Merge remote-tracking branch '39150/bad-phpdoc-sales-email-container-template-setTemplate' into octcommpr

Author: engcom-Charlie

app/code/Magento/Sales/Model/Order/Email/Container/Template.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Sales\Model\Order\Email\Container;
 
@@ -25,7 +25,7 @@ class Template implements ResetAfterRequestInterface
     protected $templateId;
 
     /**
-     * @var int
+     * @var int|string
      */
     protected $id;
 
@@ -74,7 +74,7 @@ public function getTemplateOptions()
     /**
      * Set email template id
      *
-     * @param int $id
+     * @param int|string $id
      * @return void
      */
     public function setTemplateId($id)
@@ -85,7 +85,7 @@ public function setTemplateId($id)
     /**
      * Get email template id
      *
-     * @return int
+     * @return int|string
      */
     public function getTemplateId()
     {