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

skyouc

7 天以前 18b35f1400df83e20a870dbfd7e97ae9ca277cbd

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java

@@ -20,7 +20,7 @@
    private List<Long> typeIds;

    @ApiModelProperty("作业站点")
    private String sites;
    private String site;

    @ApiModelProperty("设备编号")
    private String deviceCode;
@@ -28,4 +28,7 @@
    @ApiModelProperty("设备作业站点")
    private String deviceSites;

    @ApiModelProperty("目标站点")
    private String target;

}