Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-02 a52b9c0e0f708b36d35dbc95c591645d249d7db7

 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" />