Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

5 天以前 668590b860e572990b357747f39810e955823caf

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/TaskInParam.java

@@ -9,6 +9,7 @@
    private Integer sourceStaNo; //作业站点 or 来源站点
    private String barcode; //容器条码
    private Integer locType1; //库位类型
    private Long user;
//    private Integer locType2; //库位类型
//    private Integer locType3; //库位类型
}