From 28cd97d04c68bd8c5fd4adf7780200f61da13654 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 20 九月 2019 14:39:36 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dto/ad/DouYinUserActionInfoDTO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/ad/DouYinUserActionInfo.java b/fanli/src/main/java/com/yeshi/fanli/dto/ad/DouYinUserActionInfoDTO.java
similarity index 92%
rename from fanli/src/main/java/com/yeshi/fanli/dto/ad/DouYinUserActionInfo.java
rename to fanli/src/main/java/com/yeshi/fanli/dto/ad/DouYinUserActionInfoDTO.java
index 6fe2f2a..01950b7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/ad/DouYinUserActionInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/ad/DouYinUserActionInfoDTO.java
@@ -6,7 +6,7 @@
* @author Administrator
*
*/
-public class DouYinUserActionInfo {
+public class DouYinUserActionInfoDTO {
// 0: 婵�娲�
// 1: 娉ㄥ唽
@@ -37,7 +37,7 @@
private long convTime;// UTC鏃堕棿鎴�
private int eventType;
- public DouYinUserActionInfo(String callback, String muid, int os, long convTime,
+ public DouYinUserActionInfoDTO(String callback, String muid, int os, long convTime,
int eventType) {
this.callback = callback;
this.muid = muid;
@@ -46,7 +46,7 @@
this.eventType = eventType;
}
- public DouYinUserActionInfo() {
+ public DouYinUserActionInfoDTO() {
}
public String getCallback() {
--
Gitblit v1.8.0