소스 검색

Merge branch 'master' of http://git.cc-lotus.info/customer/service

lrf 8 달 전
부모
커밋
ce3b556866

+ 2 - 0
src/main/java/com/free/controller/ChatRecordController.java

@@ -1,5 +1,6 @@
 package com.free.controller;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -73,6 +74,7 @@ public class ChatRecordController {
       throw new CustomizationException(ExceptionEnum.CHAT_SPEAKER_NOT_IN_APPLY);
     }
     ChatRecord data = new ChatRecord();
+    data.setTime(LocalDateTime.now());
     data.setApply_id(body.getApply_id());
     data.setSpeaker(body.getSpeaker());
     data.setContent(body.getContent());

+ 1 - 0
src/main/java/com/free/controller/TransferApplyController.java

@@ -136,6 +136,7 @@ public class TransferApplyController {
   }
 
   /** 列表查询 */
+  @PassToken
   @ApiOperation("查询数据列表")
   @SuppressWarnings({ "unchecked" })
   @GetMapping()

+ 1 - 1
src/main/java/com/free/entity/ChatRecord.java

@@ -43,7 +43,7 @@ public class ChatRecord extends BaseEntity {
   @ApiModelProperty("用户id")
   private Long user_id;
 
-  @TableField(fill = FieldFill.INSERT, select = false)
+  @TableField(fill = FieldFill.INSERT)
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   @ApiModelProperty("发言时间")