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

k94314517

2023-09-11 95957395c7665c251ecf7f8bb24d95edfe826314

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

@@ -95,5 +95,8 @@
    @ApiModelProperty(value = "名称拼音首字母")
    @ExcelColumn(name="名称拼音首字母")
    private String shortPinyin;
    @ApiModelProperty(value = "关联源数据编码")
    @ExcelColumn(name="关联源数据编码")
    private String baseDataId;

}