Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-18 b42aecb23d3b2baa52fd7474282dfc1018fd066e

 server/src/main/java/doumeemes/dao/system/model/SystemMenu.java

@@ -77,5 +77,6 @@
    private Integer type;

    @ApiModelProperty(value = "文件访问前缀")
    @TableField(exist = false)
    private String resourcePath;
}