Merge branch 'dev' of liubing/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

@@ -42,8 +42,8 @@ import java.util.*;
@Service
public class MonitorPlatformService  {
//    @Value("${spring.wlyy.url}")
    private String wlyyUrl = "http://127.0.0.1:8080/";
    @Value("${spring.wlyy.url}")
    private String wlyyUrl;
    @Value("${spring.wlyy.appid}")
    private String appid;
    @Value("${spring.wlyy.appsecret}")