Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev

jiangping

2023-10-24 349bcef9a96391d22522a3409adf5a89e7e70a95

 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>