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

IZCD4L12RTSW0VZ\Administrator

1 天以前 290e5fd2e74efe19326f56e38c3391aaae23ffc5

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

@@ -247,10 +247,15 @@
    @TableField("appe_time")
    private Date appeTime;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "并板出库（缓存区AGV站点")
    @TableField("pause_mk")
    private String pauseMk;


//    @ApiModelProperty("并板出库（缓存区AGV站点）")
//    @TableField(exist = false)
//    private String avgSta;

    @ApiModelProperty(value= "")
    @TableField("error_time")
    private Date errorTime;