From 408e782c3135ed4506bd2492514ba4b6a04bae6b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 10 Jun 2019 20:32:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:list=E8=8E=B7=E5=8F=96=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/MallUserAction.java | 2 +- .../src/main/resources/mapper/MallUserActionMapper.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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}