Merge remote-tracking branch 'origin/master'

doum

2026-01-20 e68e324f91d1a4eb2d4c5f07d27ca105a308bc0c

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java

@@ -72,6 +72,7 @@
    @ApiModelProperty(value = "单位")
    @ExcelColumn(name="单位")
    private String unitName;

    @ApiModelProperty(value = "积分最多抵扣比例")
    @ExcelColumn(name="积分最多抵扣比例")
    private BigDecimal integralRate;