Merge remote-tracking branch 'remotes/origin/master' into 3.x

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/SendType.java

@@ -39,7 +39,12 @@ public enum SendType {
 	/**
 	 * 通过公众号ID发送
 	 */
-	SEND_BY_WECHAT("SEND_BY_WECHAT");
+	SEND_BY_WECHAT("SEND_BY_WECHAT"),
+
+	/**
+	 * 通过OpenId 和 OfficialId 发送
+	 */
+	SEND_BY_OPENID_OFFICIAL("SEND_BY_OPENID_OFFICIAL");
 	
 	/**
 	 * 值

pcloud-common/src/main/java/com/pcloud/common/utils/word/WordUtils.java

@@ -131,7 +131,7 @@ public class WordUtils {
            width = Math.round(width * rate);
            height = Math.round(height * rate);
             document = new Document(new Rectangle(width, height));
-            Integer A4Width = 210;
+            Integer A4Width = 595;
             if (!A4Width.equals(width)) {
                 document.setMargins(2,2,2, 2);
             }