Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/entity/config/SMSConfig.java

@@ -19,6 +19,8 @@
   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")

@@ -120,4 +122,12 @@
      this.smsExtract = smsExtract;

   }



   public String getServiceEmergency() {

      return serviceEmergency;

   }



   public void setServiceEmergency(String serviceEmergency) {

      this.serviceEmergency = serviceEmergency;

   }



}