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

tangxiaobao

2021-07-27 db9d95db6f25f95cbc614525adef7dbdeae6478c

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

@@ -5,6 +5,7 @@
import lombok.Data;

import java.util.Date;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -69,4 +70,7 @@

    @ApiModelProperty("备注")
    private String remark;

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