Merge remote-tracking branch 'origin/ytflWms' into ytflWms

Junjie

7 天以前 57fe41f460cb72684d6a76869ced6ae93577b75a

 src/main/java/com/zy/asrs/entity/param/StockOutParam.java

@@ -15,6 +15,12 @@
    // 出站口
    private Integer outSite;

    //
    private String itemId;

    //
    private String checkId;

    // 物料编号集合
    private List<LocDetl> locDetls;

@@ -58,21 +64,21 @@
         */
        @ApiModelProperty(value= "备用1")
        @TableField("box_type1")
        private String boxType1 = "1";
        private String boxType1 = "";

        /**
         * 备用2
         */
        @ApiModelProperty(value= "备用2")
        @TableField("box_type2")
        private String boxType2 = "1";
        private String boxType2 = "";

        /**
         * 备用3
         */
        @ApiModelProperty(value= "备用3")
        @TableField("box_type3")
        private String boxType3 = "1";
        private String boxType3 = "";

    }