Merge remote-tracking branch 'origin/master'

许鹏程

2023-05-24 5839384228e2f10d880d23c7a1c99ba86430634c

 product-server-admin/src/main/java/com/product/admin/entity/RouterEntity.java

@@ -565,6 +565,9 @@
            meta.put("menu_icon", fse.getString("menu_icon"));
            meta.put("button_uuid", fse.getString("button_uuid"));
            meta.put("activeMenu", fse.getString("activeMenu"));
            if (fse.getString("face_number") != null) {
                meta.put("face_number", fse.getString("face_number"));
            }
        }
    }