Merge remote-tracking branch 'origin/master'

许鹏程

2023-05-24 5839384228e2f10d880d23c7a1c99ba86430634c

 product-server-admin/src/main/java/com/product/admin/service/RouterService.java

@@ -124,7 +124,7 @@
        sql.append(" page_name title, ");
        sql.append(" d.button_icon icon, ");
        sql.append(" page_type, ");
        sql.append(" c.face_uuid,c.face_number ");
        sql.append(" c.face_uuid,c.face_number, ");
        sql.append(" d.uuid button_uuid, ");
        sql.append(" d.button_name, ");
        sql.append(" d.client_type_uuid ");