Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-07-05 abaf72a337248943e037b02d069c094e2ee5d60b

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml

@@ -42,7 +42,7 @@
            and bu.tenant_id = #{user.tenantId}
        </if>
        <if test="user.account!=null and user.account != ''">
            and bu.account = #{user.account}
            and bu.account like concat('%',#{user.account},'%')
        </if>
        <if test="user.realName!=null and user.realName != ''">
            and bu.real_name like concat(concat('%',#{user.realName}),'%')