Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev

Mr.Shi

2023-09-04 c7c49be8b15e6355dc19e8705dc7bc2de603e398

 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>