build(web): 修改excel导出列表

jeecg-boot-parent/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/pm/controller/PmAccessControlDeviceController.java

@@ -33,7 +33,7 @@ import java.util.List;
 @Slf4j
 public class PmAccessControlDeviceController extends JeecgController<PmAccessControlDevice, IPmAccessControlDeviceService> {
 
-    private static final List<String> TYPES = Arrays.asList("type-1", "type-2", "type-3");
+    private static final List<String> TYPES = Arrays.asList("出入口闸机", "访客一体机", "自助访客机", "身份证读卡器", "人脸识别");
 
     @Autowired
     private IPmAccessControlDeviceService pmAccessControlDeviceService;

jeecg-boot-parent/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/pm/entity/PmAccessControlDevice.java

@@ -34,6 +34,7 @@ public class PmAccessControlDevice implements Serializable {
     /**
      * id
      */
+    @Excel(name = "id", width = 15)
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     private Long id;
@@ -151,6 +152,7 @@ public class PmAccessControlDevice implements Serializable {
     /**
      * 创建时间
      */
+    @Excel(name = "修改时间", width = 15, format = "yyyy-MM-dd hh:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
@@ -158,8 +160,8 @@ public class PmAccessControlDevice implements Serializable {
     /**
      * 修改时间
      */
-    @Excel(name = "修改时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 15, format = "yyyy-MM-dd hh:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "修改时间")
     private Date modifyTime;