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

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/FacilityUsedRecordController.java

@@ -161,7 +161,7 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
                    facilityUsedRecord1.setNum((int) count);
                    //获取设施状态
                    Facility facility = facilityService.findByCode(facilityUsedRecord1.getFacilitieCode());
                    facilityUsedRecord1.setFacilitieStatus(facility.getStatus());
                    facilityUsedRecord1.setFacilitieStatus(null == facility ? "1" : facility.getStatus());
                }
            }
        }

svr/svr-healthy-house/src/main/resources/application.yml

@@ -87,7 +87,7 @@ jw:
  smsUrl: http://svr-base:10020/sms_gateway/send
img:
  #path: E:/tryfile/upload/img  //测试
  path: /root/uploadFiles/
  path: /root/uploadFiles/group1
---
spring: