From 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Fri, 16 Apr 2021 17:33:07 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev --- screen-api/src/main/resources/mapper/UserLogMapper.xml | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/screen-api/src/main/resources/mapper/UserLogMapper.xml b/screen-api/src/main/resources/mapper/UserLogMapper.xml index 52f730a..94e75cc 100644 --- a/screen-api/src/main/resources/mapper/UserLogMapper.xml +++ b/screen-api/src/main/resources/mapper/UserLogMapper.xml @@ -2,14 +2,15 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.moral.api.mapper.UserLogMapper"> - <!-- ������������������������ --> - <resultMap id="BaseResultMap" type="com.moral.api.entity.UserLog"> - <id column="id" property="id" /> - <result column="content" property="content" /> - <result column="organization_id" property="organizationId" /> - <result column="operate_id" property="operateId" /> - <result column="ip" property="ip" /> - <result column="create_time" property="createTime" /> - </resultMap> + <!-- ������������������������ --> + <resultMap id="BaseResultMap" type="com.moral.api.entity.UserLog"> + <id column="id" property="id" /> + <result column="type" property="type" /> + <result column="content" property="content" /> + <result column="organization_id" property="organizationId" /> + <result column="operate_id" property="operateId" /> + <result column="ip" property="ip" /> + <result column="create_time" property="createTime" /> + </resultMap> </mapper> \ No newline at end of file -- Gitblit v1.8.0