Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -436,7 +436,8 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            object.put("type","Wap");
            object.put("wap_url","");
            object.put("wap_name","");
            map.put("scene_info",object.toJSONString());
            jsonObject.put("h5_info",object);
            map.put("scene_info",jsonObject.toJSONString());
        }
      /*  String token_url = "https://api.weixin.qq.com/cgi-bin/token";
        String params = "grant_type=client_credential&appid=" + wxWechatDO.getAppId() + "&secret=" + wxWechatDO.getAppSecret();