Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-04 202c08e4c835e4fa00452577d954025045f7961e

 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;

}