Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

昨天 fe8d6e225812fee9723a3a942481fdaf171a9dbc

 src/main/java/com/zy/asrs/entity/Order.java

@@ -79,6 +79,10 @@
    @TableField("allot_item_id")
    private Long allotItemId;

    @ApiModelProperty("目标库区")
    @TableField("target_location")
    private String targetLocation;

    /**
     * 初始票据号
     */
@@ -216,6 +220,10 @@
    @TableField("ship_code")
    private String shipCode;

    @ApiModelProperty("上报次数")
    @TableField("report_once")
    private Integer reportOnce;

    /**
     * 订单状态
     */