Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-31 945c7091d1db4e156a7a2b5ccd24c888cbce40a5

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml

@@ -105,5 +105,8 @@
        ORDER BY
            u.user_id DESC
    </select>
    <select id="selectByUserId" resultMap="BaseResultMap">
        SELECT u1.* FROM sys_user u1 WHERE u1.phone = (SELECT phone FROM sys_user u2 WHERE u2.user_id=#{userId}) AND u1.app_id in ('wx118de8a734d269f0','wx0cef797390444b75')
    </select>

</mapper>