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

liuleilei

2023-09-11 faf1d3cc35a3a5f83558946c8056537a4d77fa1f

 server/src/main/resources/mappers/SystemPermissionMapper.xml

@@ -86,6 +86,7 @@
      perm.DELETED = 0
      AND role_perm.ROLE_ID = #{roleId}
    </where>
    GROUP BY perm.id
  </select>

</mapper>