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

jiaosong

2023-09-11 f417d6b965a16fb197ac8c49b383fbeedd28e23d

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

@@ -117,6 +117,13 @@
    @ExcelColumn(name="名称拼音首字母")
    private String shortPinyin;

    @ApiModelProperty(value = "商品编码（关联base_goods表）")
    private Integer goodsId;

    @ApiModelProperty(value = "创建类别：0=自建；1=拉取")
    private Integer type;


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