~chenjialiang/moral.git

陈家良 / moral

forked from moral

summary
commits
tree
docs
forks
compare

Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-08-25 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3

 screen-manage/src/main/resources/mapper/ManageLogMapper.xml

@@ -6,6 +6,7 @@
        <resultMap id="BaseResultMap" type="com.moral.api.entity.ManageLog">
                    <id column="id" property="id" />
                    <result column="account_id" property="accountId" />
                    <result column="type" property="type" />
                    <result column="user_name" property="userName" />
                    <result column="content" property="content" />
                    <result column="ip" property="ip" />

			@@ -6,6 +6,7 @@
			<resultMap id="BaseResultMap" type="com.moral.api.entity.ManageLog">
			<id column="id" property="id" />
			<result column="account_id" property="accountId" />
			<result column="type" property="type" />
			<result column="user_name" property="userName" />
			<result column="content" property="content" />
			<result column="ip" property="ip" />