From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/config/SMSConfig.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/config/SMSConfig.java b/fanli/src/main/java/com/yeshi/fanli/entity/config/SMSConfig.java
index 4a0064f..cbae9a6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/config/SMSConfig.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/config/SMSConfig.java
@@ -19,12 +19,44 @@
 	private String smsExtractSuccess;
 	@Map("sms_extract_fail")
 	private String smsExtractFail;
+	@Map("sms_service_emergency")
+	private String serviceEmergency;
 	@Map("sms_appid")
 	private String smsAppId;
 	@Map("sms_appkey")
 	private String smsAppKey;
 	@Map("sms_sign")
 	private String smsSign;
+	@Map("sms_aliyun_accesskey_id")
+	private String aliyunAppId;
+	@Map("sms_aliyun_accesskey_secret")
+	private String aliyunAppSecret;
+	@Map("sms_aliyun_login_template_code")
+	private String aliyunLoginTemplatecode;// 闃块噷浜戠櫥褰曢獙璇佺爜妯℃澘
+
+	public String getAliyunLoginTemplatecode() {
+		return aliyunLoginTemplatecode;
+	}
+
+	public void setAliyunLoginTemplatecode(String aliyunLoginTemplatecode) {
+		this.aliyunLoginTemplatecode = aliyunLoginTemplatecode;
+	}
+
+	public String getAliyunAppId() {
+		return aliyunAppId;
+	}
+
+	public void setAliyunAppId(String aliyunAppId) {
+		this.aliyunAppId = aliyunAppId;
+	}
+
+	public String getAliyunAppSecret() {
+		return aliyunAppSecret;
+	}
+
+	public void setAliyunAppSecret(String aliyunAppSecret) {
+		this.aliyunAppSecret = aliyunAppSecret;
+	}
 
 	public String getSmsExtractSuccess() {
 		return smsExtractSuccess;
@@ -90,4 +122,12 @@
 		this.smsExtract = smsExtract;
 	}
 
+	public String getServiceEmergency() {
+		return serviceEmergency;
+	}
+
+	public void setServiceEmergency(String serviceEmergency) {
+		this.serviceEmergency = serviceEmergency;
+	}
+
 }

--
Gitblit v1.8.0