Merge remote-tracking branch 'origin/master'

CeDo

2021-04-27 d2fe6196f1991d10b48adf2debf8521b34f4c461

 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;

}