Merge remote-tracking branch 'origin/master'

cy

2023-11-22 b3585e6475b7a7ab38fcb8af79def5e938a297ea

 consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java

@@ -18,7 +18,10 @@
    private Integer counts;
    private Integer worehouseCount;
    private Long baseGoodsModelsId;
    private Long totalAmount;
    private Integer totalAmount;


    private String scrappedName;


}