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

tangxiaobao

2021-08-04 202c08e4c835e4fa00452577d954025045f7961e

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysMenuVO.java

@@ -71,5 +71,6 @@
    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("子菜单")
    private List<SysMenuVO> sysMenuVOList;
}