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

zhou zhou

4 天以前 92ff7ea27e6f99c004c727d471f2f3d82c1c3a30

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

@@ -71,6 +71,10 @@
    @TableField("order_no")
    private String orderNo;

    @ApiModelProperty(value= "单据id")
    @TableField("order_id")
    private Long orderId;

    /**
     * 规格
     */