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/service/facility/FacilityService.java

@@ -337,7 +337,7 @@ public class FacilityService extends BaseJpaService<Facility, FacilityDao> {
                        relation.setServiceCode(facilityServer.getCode());
                        relation.setServiceName(facilityServer.getName());
                        relation.setServiceName(facilityServer.getName());
                        facilityServerRelationDao.save(relations);
                        facilityServerRelationDao.save(relation);
                    }
//                    facilityServerRelationDao.save(relations);
                }