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

cjl

2023-08-30 6dc7dc3670300ec7949f8134ab80166107b2f705

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

@@ -5,6 +5,7 @@
        <!-- 通用查询映射结果 -->
        <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" />