Merge branch 'V1' of http://223.75.76.159:9090/xiao547607/smart-community-server

web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonDeviceRelationController.java

@@ -389,7 +389,7 @@ public class PersonDeviceRelationController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("create_time","desc"));
 
-        searchParams.put("companyId",user.getCompanyId());
+        //searchParams.put("companyId",user.getCompanyId());
 
         Page<DeviceInfo> page = deviceInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 

web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonInfoController.java

@@ -889,6 +889,7 @@ public class PersonInfoController {
                 }
 
                 personInfo.setFaceBound(success);
+                personInfo.setFaceEnabled(success);
                 personInfo.setUpdateTime(new Date());
                 personInfoService.update(personInfo);