Merge branch 'htwms' of https://gitee.com/luxiaotao1123/wms-cloud into htwms

luxiaotao1123

2021-05-29 af11d4845251da536d564a82fa019b4306875da9

 src/main/java/zy/cloud/wms/manager/entity/Comb.java

@@ -24,9 +24,9 @@
    private String zpallet;

    /**
     * 货物数量
     * 库存余量
     */
    @ApiModelProperty(value= "货物数量")
    @ApiModelProperty(value= "库存余量")
    private Double anfme;

    /**
@@ -194,7 +194,7 @@

//    Comb comb = new Comb(
//            null,    // 托盘码
//            null,    // 货物数量
//            null,    // 库存余量
//            null,    // 商品编号[非空]
//            null,    // 商品名称
//            null,    // 名称