Merge branch 'cedoodev' into test

CeDo

2021-05-21 0da7066cdd4dc8c6ed7b2b5855202d8c0914f33b

 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;

}