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

xyh

2021-06-28 7d16a1da2ab2bfdabf247af19b516a84a459bb32

 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;
}