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

skyouc

4 天以前 1de6b39bfe3967916dcab8122be0d69fbaba8cca

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java

@@ -90,6 +90,12 @@
    @ApiModelProperty("质检数量")
    private Double anfme;

    /**
     * 平台标识（行号）
     */
    @ApiModelProperty(value = "平台标识（行号）")
    private String platItemId;

    @ApiModelProperty("客户订单号")
    private String platOrderCode;

@@ -145,6 +151,7 @@
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;

    /**