Merge branch 'hzk' into 'master'

发邮件加字段

See merge request rays/pcloud-common-parent!36

pcloud-common-core/src/main/java/com/pcloud/common/core/dto/SendEmailDto.java

@@ -37,6 +37,14 @@ public class SendEmailDto implements Serializable{
 	 * 发件人昵称
 	 */
 	private String nickName;
+	/**
+	 * 附件路径是否为短链接
+	 */
+	private Boolean isShortUrl;
+	/**
+	 * 文件大小
+	 */
+	private Long fileSize;
 	public String getToEmail() {
 		return toEmail;
 	}
@@ -67,11 +75,33 @@ public class SendEmailDto implements Serializable{
 	public void setNickName(String nickName) {
 		this.nickName = nickName;
 	}
+
+	public Boolean getIsShortUrl() {
+		return isShortUrl;
+	}
+
+	public void setIsShortUrl(Boolean isShortUrl) {
+		this.isShortUrl = isShortUrl;
+	}
+
+	public Long getFileSize() {
+		return fileSize;
+	}
+
+	public void setFileSize(Long fileSize) {
+		this.fileSize = fileSize;
+	}
+
 	@Override
 	public String toString() {
-		return "SendEmailDto [toEmail=" + toEmail + ", typeCode=" + typeCode + ", content=" + content + ", file=" + file
-				+ ", nickName=" + nickName + "]";
+		return "SendEmailDto{" +
+				"toEmail='" + toEmail + '\'' +
+				", typeCode='" + typeCode + '\'' +
+				", content=" + content +
+				", file=" + file +
+				", nickName='" + nickName + '\'' +
+				", isShortUrl=" + isShortUrl +
+				", fileSize=" + fileSize +
+				'}';
 	}
-
-	
 }