Merge branch 'cedoodev' into test

CeDo

2021-05-20 02d0c4d43358e3c034b3964d4cc30f9fed7cc843

 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;

}