Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

infrasys00

2021-02-25 e55127388abe16a13eafa2a22562742d209e2396

 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;

}