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

cjl

2023-10-25 8af1bd5ed227ff568b3ac60f3594ae2a8dfd9dec

 screen-api/src/main/resources/mapper/UserMapper.xml

@@ -17,6 +17,7 @@
        <result column="update_time" property="updateTime"/>
        <result column="expire_time" property="expireTime"/>
        <result column="is_delete" property="isDelete"/>
        <result column="unit_id" property="unitId"/>
    </resultMap>

    <resultMap id="userInfoMap" type="com.moral.api.pojo.bo.UserBO" extends="BaseResultMap">