Merge branch 'test' into 'master'

罗yu 元桥

2021-05-07 6c4db89ea8795d6be8431f698051e62bec9ec956

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleMenuDO.java

@@ -25,8 +25,5 @@
     * 菜单id
     */
    private Long menuId;
    /**
     * 协议名字
     */
    private String name;

}