Merge remote-tracking branch 'origin/master'

ludc

2023-09-12 114c0b5aa8bffa7120d7294ba0631d2ef78711c1

 Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml

@@ -74,7 +74,7 @@
            LEFT JOIN PL_SYS_USER_PWDSTRATEGY plup on plup.USER_ID=pou.ID
            LEFT JOIN PL_SYS_PWDSTRATEGY pss on pss.ID=plup.PWDSTRATEGY_ID
        WHERE
            tenant_id = #{param1} and account = #{param2}
            pou.tenant_id = #{param1} and account = #{param2}
            <if test="param3!=null and param3 != ''">
                and name = #{param3}
            </if>