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

huanghongfa

2021-06-29 7088afc56b7e08d69b5b470b123e95e2b49d5d17

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