Merge branch 'master' of https://gitee.com/jishenghua/JSH_ERP

2019-01-23 14:01:00 +08:00
parent 309d575c5d dd6f7d8a51
commit 4744dee4fb
13 changed files with 157 additions and 47 deletions
--- a/src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java
@@ -3,6 +3,8 @@ package com.jsh.erp.datasource.mappers;
 import com.jsh.erp.datasource.entities.Log;
 import com.jsh.erp.datasource.entities.LogExample;
 import java.util.List;
+
+import com.jsh.erp.datasource.vo.LogVo4List;
 import org.apache.ibatis.annotations.Param;

 public interface LogMapper {
@@ -94,7 +96,7 @@ public interface LogMapper {
     */
    int updateByPrimaryKey(Log record);

-    List<Log> selectByConditionLog(
+    List<LogVo4List> selectByConditionLog(
            @Param("operation") String operation,
            @Param("usernameID") Integer usernameID,
            @Param("clientIp") String clientIp,