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

skyouc

昨天 fe8d6e225812fee9723a3a942481fdaf171a9dbc

 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;

    /**
     * 规格
     */