From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java
index 54ee843..4bee734 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java
@@ -1,7 +1,6 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -14,12 +13,12 @@
/**
* 鏈堝彴_鍙彿鎺掗槦淇℃伅琛�
* @author 姹熻箘韫�
- * @since 2024/04/28 16:06
+ * @date 2024/06/28 10:03
*/
@Data
@ApiModel("鏈堝彴_鍙彿鎺掗槦淇℃伅琛�")
@TableName("`platform_queue`")
-public class PlatformQueue extends LoginUserModel {
+public class PlatformQueue {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -32,6 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,6 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -54,10 +55,6 @@
@ExcelColumn(name="鏈堝彴浣滀笟缂栫爜锛堝叧鑱攑latform_job)")
private Integer jobId;
- @ApiModelProperty(value = "鏍囬")
- @ExcelColumn(name="鏍囬")
- private String title;
-
@ApiModelProperty(value = "绠�浠�")
@ExcelColumn(name="绠�浠�")
private String content;
@@ -66,8 +63,8 @@
@ExcelColumn(name="鐘舵�� 0绛夊緟涓� 1鍙彿涓� 2浣滀笟涓�")
private Integer status;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜 0浣滀笟", example = "1")
- @ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜 0浣滀笟")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜 0鏈堝彴浣滀笟", example = "1")
+ @ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜 0鏈堝彴浣滀笟")
private Integer objType;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜", example = "1")
--
Gitblit v1.9.3