Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

gongchunyi

14 小时以前 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

 inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java

@@ -24,6 +24,9 @@
    @ApiModelProperty(value = "下单类别")
    private Integer typeSource;

    @ApiModelProperty(value = "物料属性")
    private String materialProp;

    @ApiModelProperty(value = "检验类别")
    private String orderType;