Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

chen.lin

2 天以前 79843611908e58f9538f8d8ebac62d3f0d01712c

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

@@ -14,7 +14,7 @@
    private Integer ioType;  //作业类型

    @ApiModelProperty("作业站点 or 来源站点")
    private Integer sourceStaNo; //作业站点 or 来源站点
    private String sourceStaNo; //作业站点 or 来源站点

    @ApiModelProperty("容器条码")
    private String barcode; //容器条码