diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java
index b99c6ec21..420160928 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserAction.java
@@ -44,7 +44,7 @@ public class MallUserAction implements Serializable {
,UserId_ASC("`user_id` ASC"),UserId_DESC("`user_id` DESC")
,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,Ip_ASC("`ip` ASC"),Ip_DESC("`ip` DESC")
- ,Desc_ASC("`action_desc` ASC"),Desc_DESC("`action_desc` DESC")
+ ,ActionDesc_ASC("`action_desc` ASC"),ActionDesc_DESC("`action_desc` DESC")
,ActionTime_ASC("`action_time` ASC"),ActionTime_DESC("`action_time` DESC")
;
private String value;
diff --git a/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml b/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml
index b5dbd5b08..04fde2677 100644
--- a/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml
+++ b/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml
@@ -6,12 +6,12 @@
-
+
- `id`,`user_id`,`type`,`ip`,`desc`,`action_time`
+ `id`,`user_id`,`type`,`ip`,`action_desc`,`action_time`
@@ -28,8 +28,8 @@
and `ip` like concat('%', #{ip},'%')
-
- and `desc` like concat('%', #{desc},'%')
+
+ and `action_desc` like concat('%', #{actionDesc},'%')
and `action_time` = #{actionTime}