Merge remote-tracking branch 'origin/master'

doum

2026-01-20 e68e324f91d1a4eb2d4c5f07d27ca105a308bc0c

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

@@ -98,8 +98,8 @@
    @ApiModelProperty(value = "积分抵扣金额", example = "1")
    private BigDecimal integralDeduct;



    @ApiModelProperty(value = "经销商结算金额", example = "1")
    private BigDecimal shopSettlement;


    @ApiModelProperty(value = "商品标签名称")
@@ -119,5 +119,8 @@
    @ApiModelProperty(value = "父类名称")
    @TableField(exist = false)
    private String parentName;
    @ApiModelProperty(value = "统计量")
    @TableField(exist = false)
    private BigDecimal totalNum;

}