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

huanghongfa

2021-07-22 7569b9671f219d535838e4b55414ac1c9813a52e

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