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

guoshilong

2023-05-25 affff835d01de682a503eee8b71d48bf35255a50

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

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