Merge remote-tracking branch 'origin/V1' into V1

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

@@ -711,14 +711,14 @@ public class PersonInfoController {
             cellTitle8.setCellValue("位置4");
             HSSFCell cellTitle9 = rowTitle.createCell(8);
             cellTitle9.setCellValue("位置5");
-            HSSFCell cellTitle10 = rowTitle.createCell(9);
-            cellTitle10.setCellValue("人脸开关");
-            HSSFCell cellTitle11 = rowTitle.createCell(10);
-            cellTitle11.setCellValue("刷卡开关");
-            HSSFCell cellTitle12 = rowTitle.createCell(11);
-            cellTitle12.setCellValue("手机开关");
-            HSSFCell cellTitle13 = rowTitle.createCell(12);
-            cellTitle13.setCellValue("访客开关");
+//            HSSFCell cellTitle10 = rowTitle.createCell(9);
+//            cellTitle10.setCellValue("人脸开关");
+//            HSSFCell cellTitle11 = rowTitle.createCell(10);
+//            cellTitle11.setCellValue("刷卡开关");
+//            HSSFCell cellTitle12 = rowTitle.createCell(11);
+//            cellTitle12.setCellValue("手机开关");
+//            HSSFCell cellTitle13 = rowTitle.createCell(12);
+//            cellTitle13.setCellValue("访客开关");
 
             //表内容
             List<Sort> sortList = new ArrayList<>();
@@ -776,14 +776,14 @@ public class PersonInfoController {
                 if(personInfo.getPosition4() != null) cellContent8.setCellValue(personInfo.getPosition4());
                 HSSFCell cellContent9 = rowContent.createCell(8);
                 if(personInfo.getPosition5() != null) cellContent9.setCellValue(personInfo.getPosition5());
-                HSSFCell cellContent10 = rowContent.createCell(9);
-                if(personInfo.getFaceEnabled() != null && personInfo.getFaceEnabled() == true) cellContent10.setCellValue("开"); else cellContent10.setCellValue("关");
-                HSSFCell cellContent11 = rowContent.createCell(10);
-                if(personInfo.getCardEnabled() != null && personInfo.getCardEnabled() == true) cellContent11.setCellValue("开"); else cellContent11.setCellValue("关");
-                HSSFCell cellContent12 = rowContent.createCell(11);
-                if(personInfo.getAppEnabled() != null && personInfo.getAppEnabled() == true) cellContent12.setCellValue("开"); else cellContent12.setCellValue("关");
-                HSSFCell cellContent13 = rowContent.createCell(12);
-                if(personInfo.getGuestEnabled() != null && personInfo.getGuestEnabled() == true) cellContent13.setCellValue("开"); else cellContent13.setCellValue("关");
+//                HSSFCell cellContent10 = rowContent.createCell(9);
+//                if(personInfo.getFaceEnabled() != null && personInfo.getFaceEnabled() == true) cellContent10.setCellValue("开"); else cellContent10.setCellValue("关");
+//                HSSFCell cellContent11 = rowContent.createCell(10);
+//                if(personInfo.getCardEnabled() != null && personInfo.getCardEnabled() == true) cellContent11.setCellValue("开"); else cellContent11.setCellValue("关");
+//                HSSFCell cellContent12 = rowContent.createCell(11);
+//                if(personInfo.getAppEnabled() != null && personInfo.getAppEnabled() == true) cellContent12.setCellValue("开"); else cellContent12.setCellValue("关");
+//                HSSFCell cellContent13 = rowContent.createCell(12);
+//                if(personInfo.getGuestEnabled() != null && personInfo.getGuestEnabled() == true) cellContent13.setCellValue("开"); else cellContent13.setCellValue("关");
             }
 
             //todo 将wb保存到oss