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

k94314517

2023-09-20 a2735382e853f89465e328dce2df9f3f465bcda9

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

@@ -77,4 +77,7 @@
    @TableField(exist = false)
    private String imgfullurl;

    @ApiModelProperty(value = "分类主键")
    @TableField(exist = false)
    private Integer categoryId;
}