Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng

KKSU

2024-09-30 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5

 src/main/resources/mapper/RoleMapper.xml

@@ -12,6 +12,9 @@
                <if test="record.roleName!=null">
                    and a.role_name like concat ('%',#{record.roleName},'%')
                </if>
                <if test="record.companyId!=null">
                    and a.company_id = #{record.companyId}
                </if>
            </if>
        </where>
        order by a.create_time desc