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

jiaosong

2023-08-28 a79f7d80e55319ae1a40954f6a4ce6e382cc1649

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