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

gongchunyi

昨天 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

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

@@ -31,4 +31,7 @@
    @ApiModelProperty("是否同步到MES")
    private Boolean pushToMes;

    @ApiModelProperty("物料属性，用于区分铜、铝导体等材料")
    private String materialProp;

}