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

peng

2025-09-11 127a0f6ab38866d0b05b32d2102cc85638a06e62

 framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsVO.java

@@ -35,4 +35,6 @@

    @ApiModelProperty(value = "批发商品消费规则列表")
    private List<Wholesale> wholesaleList;

    private String id;
}