Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 64210399 430dad99
Showing 2 changed files with 2 additions and 4 deletions
fw-shirasawa-sdk/src/main/java/cn/fw/shirasawa/sdk/mq/FollowResultDTO.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/CustomEventListener.java
 package cn.fw.shirasawa.sdk.mq;
  
-import cn.fw.shirasawa.sdk.enums.DataTypeEnum;
 import lombok.Data;
  
 import java.util.Date;
@@ -22,7 +21,7 @@ public class FollowResultDTO {
     /**
      * 跟进类型
      */
-    private DataTypeEnum type;
+    private Integer type;
     /**
      * 业务id
      */
@@ -9,7 +9,6 @@ import cn.fw.shirasawa.domain.db.pool.CluePool;
 import cn.fw.shirasawa.domain.enums.ApproveStateEnum;
 import cn.fw.shirasawa.domain.enums.ApproveTypeEnum;
 import cn.fw.shirasawa.rpc.flow.FlowApproveRpc;
-import cn.fw.shirasawa.sdk.enums.DataTypeEnum;
 import cn.fw.shirasawa.sdk.mq.FollowResultDTO;
 import cn.fw.shirasawa.service.bus.follow.FollowBizService;
 import cn.fw.shirasawa.service.data.ApproveRecordService;
@@ -79,7 +78,7 @@ public class CustomEventListener {
             }
             FollowResultDTO dto = new FollowResultDTO();
             dto.setCustomerId(record.getCustomerId());
-            dto.setType(DataTypeEnum.ofValue(record.getType().getValue()));
+            dto.setType(record.getType().getValue());
             dto.setDetailId(cluePool.getRefererId());
             dto.setUserId(record.getUserId());
             dto.setUserName(record.getUserName());