Merge branch 'hsposter' into dev

common/components/PosterUtil.php

@@ -53,7 +53,8 @@ class PosterUtil
 
     const MID_AFTER_COVER_GAP = 16;
 
-    const MID_BLOCK_GAP = 10;
+    /** 商品名称与备注之间的间距 */
+    const MID_BLOCK_GAP = 18;
 
     const MID_LINE_GAP = 6;
 
@@ -61,8 +62,6 @@ class PosterUtil
 
     const MID_REMARK_SIZE = 26;
 
-    const REMARK_PREFIX = '注意：';
-
     const QR_SIZE = 220;
 
     const QR_PAD_RIGHT = 36;
@@ -308,7 +307,7 @@ class PosterUtil
             return [];
         }
 
-        return self::splitPosterTextToLines(self::REMARK_PREFIX . $itemRemark);
+        return self::splitPosterTextToLines($itemRemark);
     }
 
     /** @deprecated 请用 buildPosterRemarkLines */