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

1

昨天 2323e7ce37d12a689f00948a54d79f24a9b37561

 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;
}