Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 2d28d91d6ca70f8b60a24f6807ff1a2d1e117eb2

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -91,6 +91,9 @@
        <include refid="selectSysUserVo"/>
        <where>
            user_type=#{userType}
            <if test="keyWord!=null and keyWord!=''">
              and (transaction_names like concat('%',#{keyWord}, '%') or  user_name like concat('%',#{keyWord}, '%'))
            </if>
        </where>
        ORDER BY department_id
    </select>