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

jiaosong

2023-09-11 47f9dffa729e76ae5d0f2f845f55d8cc7179e8ac

 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;

}