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

gongchunyi

2 天以前 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

 basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java

@@ -30,6 +30,9 @@
    @ApiModelProperty("订单类型(01raw:原材料，02wg:外购成品)")
    private String orderType;

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

    @ApiModelProperty("行号")
    private String lineNo;