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

jinpengyong

2023-08-25 1267661c4028d4adb6629b3c6f00c686aa35eb8a

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