Merge remote-tracking branch 'origin/master'

liujie

2023-05-24 7a1b2baf3546f62f27327f5d4209ab4311069abc

 src/main/java/com/stylefeng/guns/modular/system/model/GoodsListDto.java

@@ -13,5 +13,5 @@
    private Integer danger;
    @ApiModelProperty("是否超重 0否 1是")
    private Integer weight;
    private List<GoodsDto> list;
    private List<TGoods> list;
}