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

k94314517

2025-07-03 722ae12e6b2e29ccb6f9d208ad231957ea42a091

 server/service/src/main/resources/mappers/SystemRoleMapper.xml

@@ -33,6 +33,9 @@
      <if test="dto.type != null">
        AND role.type = #{dto.type}
      </if>
      <if test="dto.companyId != null">
        AND role.COMPANY_ID = #{dto.companyId}
      </if>
    </where>
    ${orderByClause}
  </select>