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

skyouc

4 天以前 d2e0994f67495fd436a2e8ad02cb7e4a7e53fe0c

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/CheckObjDto.java

@@ -39,7 +39,7 @@
    @ApiModelProperty("图片路径")
    private String picPath;
    @ApiModelProperty("质检结果")
    private String isptResult;
    private Short isptResult;
    @ApiModelProperty("备注")
    private String memo;
}