From 22a00c47589ded6699a563690ee5545b73eaca01 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 09:30:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
index 1bfa566..79d0248 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -49,7 +49,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -76,16 +76,16 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnu;
- @ApiModelProperty(value = "绫诲瀷 0鍗曢�� 1澶氶�� ", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍗曢�� 1澶氶�� ")
+ @ApiModelProperty(value = "绫诲瀷 0鍗曢�� 1澶氶�� 2鍒ゆ柇", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鍗曢�� 1澶氶�� 2鍒ゆ柇")
private Integer type;
@ApiModelProperty(value = "鍒嗗��", example = "1")
@ExcelColumn(name="鍒嗗��")
private BigDecimal score;
- @ApiModelProperty(value = "浣跨敤鍦烘櫙 0鍔冲姟浜哄憳 1鏅�氳瀹�", example = "1")
- @ExcelColumn(name="浣跨敤鍦烘櫙 0鍔冲姟浜哄憳 1鏅�氳瀹�")
+ @ApiModelProperty(value = "浣跨敤鍦烘櫙 0璁垮鍜屽姵鍔� 1浠呰瀹� 2浠呭姵鍔�", example = "1")
+ @ExcelColumn(name="浣跨敤鍦烘櫙 浣跨敤鍦烘櫙 0璁垮鍜屽姵鍔� 1浠呰瀹� 2浠呭姵鍔�")
private Integer useType;
@ApiModelProperty(value = "閫夐」闆嗗璞￠泦鍚�")
--
Gitblit v1.9.3