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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/DeviceDetailService.java

@@ -50,7 +50,7 @@ public class DeviceDetailService extends BaseJpaService<DeviceDetail, DeviceDeta
	private JdbcTemplate jdbcTemplate;
	@Autowired
	private HttpClientUtil httpClientUtil;
	@Value("${cloudCare.url}")
	@Value("${cloudCareDevice.url}")
	private String cloudDeviceUrl;

svr/svr-cloud-care/src/main/resources/application.yml

@@ -185,7 +185,7 @@ base:
  hospitalUrl: http://172.26.0.107:10022/
cloudCare:
  url: http://172.26.0.107:9112/
  deviceUrl: http://172.26.0.107:9112/
---
spring:
  profiles: jwtest
@@ -293,7 +293,7 @@ base:
  hospitalUrl: http://172.26.0.107:10022/
cloudCare:
  url: http://172.26.0.107:9112/
  deviceUrl: http://172.26.0.107:9112/
---
spring:
  profiles: jwprod
@@ -403,7 +403,7 @@ base:
  hospitalUrl: http://172.26.0.107:10022/
cloudCare:
  url: http://172.26.0.107:9112/
  deviceUrl: http://172.26.0.107:9112/
---
spring:
  profiles: hzprod
@@ -511,4 +511,4 @@ base:
  hospitalUrl: http://127.0.0.7:10022/
cloudCare:
  url: https://zhyzh.hzxc.gov.cn/device/
  deviceUrl: https://zhyzh.hzxc.gov.cn/device/