Selaa lähdekoodia

修改教育培训任务字段类型

zhulu 2 vuotta sitten
vanhempi
commit
81d4bab409

+ 1 - 1
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/domain/CoreEduTrainingTaskToUser.java

@@ -34,7 +34,7 @@ public class CoreEduTrainingTaskToUser {
 
     @TableField("user_name")
     @ApiModelProperty(value = "用户名称")
-    private String username;
+    private String userName;
 
     @TableField("type")
     @ApiModelProperty(value = "1:参与人员,2:缺席人员")

+ 2 - 2
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/CoreEduTrainingTaskEditDto.java

@@ -49,11 +49,11 @@ public class CoreEduTrainingTaskEditDto {
     @ApiModelProperty(value = "截止日期")
     private Date endDate;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训开始时间")
     private Date trainingStartDateTime;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训截止时间")
     private Date trainingEndDateTime;
 

+ 1 - 1
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskPageVo.java

@@ -49,7 +49,7 @@ public class CoreEduTrainingTaskPageVo {
     private Long hostId;
 
     @ApiModelProperty(value = "主持人名称")
-    private Long hostName;
+    private String hostName;
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")