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

zhou zhou

4 天以前 92ff7ea27e6f99c004c727d471f2f3d82c1c3a30

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

@@ -16,7 +16,6 @@
import java.util.Date;

@Data
@Accessors(chain = true)
@TableName("asr_wrk_detl")
public class WrkDetl implements Serializable {

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

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

    /**
     * 规格
     */