Merge branch 'V0.0.7.409' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.7.409

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityWorkExport.java

@@ -55,7 +55,7 @@ public class SecurityWorkExport {
     private Integer departureReachNumber;
     @ExcelProperty(value = {"自助设备", "自助设备总数"}, index = 17)
     private Integer selfServiceDevicesTotal;
-    @ExcelProperty(value = {"自助设备", "在行大堂式机具"}, index = 18)
+    @ExcelProperty(value = {"自助设备", "在行式大堂式机具"}, index = 18)
     private Integer onLineLobbyImplement;
     @ExcelProperty(value = {"自助设备", "在行式穿墙式机具"}, index = 19)
     private Integer onLineThroughWalls;
@@ -85,7 +85,7 @@ public class SecurityWorkExport {
     private String isAlone;
     @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人为专职人数"}, index = 32)
     private Integer managerFullTime;
-    @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人为兼职职人数"}, index = 33)
+    @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人为兼职人数"}, index = 33)
     private Integer managerPartTime;
     @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人安保持证人数"}, index = 34)
     private Integer managerCertificate;