Merge branch 'lvy' of http://219.151.185.227:3000/zhuwei/bladex into dev

# Conflicts:
#	blade-common/src/main/java/org/springblade/common/utils/YiKeYunApiUtils.java

blade-common/src/main/java/org/springblade/common/utils/YiKeYunApiUtils.java

@@ -15,12 +15,10 @@ import java.util.Map;
 @Slf4j
 public class YiKeYunApiUtils {
     private static final String API_YIKEYUN_APPID = "97543277";
-
     private static final String API_YIKEYUN_APPSECRET = "PXd7GE2j";
 
 
 
-
     /**
      * 根据城市adcode获取天气信息, 易客云 api
      * api doc <a href="http://tianqiapi.com/index/doc?version=day"></a>