Merge branch 'master' into test

authorize-sdk/src/main/java/com/xy/entity/SysMenuJoinSysRoleMenu.java

@@ -124,4 +124,9 @@ public class SysMenuJoinSysRoleMenu implements Serializable {
      * 小程序菜单图标
      */
     private String miniMenuIcon;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }