Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-28 22a8cf0fc39555be78a030d208215fa7f6ad6bc4

 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;

}