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

jiaosong

2023-09-14 4dadac0d032c1b2543ff9bd7251d73a90f8e3b11

 server/service/src/main/java/com/doumee/dao/business/model/Brand.java

@@ -75,6 +75,6 @@

    @ApiModelProperty(value = "前缀路径")
    @TableField(exist = false)
    private String prefixUrl;
    private String imgfullurl;

}