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

lty

17 小时以前 01fa93b5dd9f20286ef8f22515caf55307f76a9d

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

@@ -32,6 +32,8 @@
    private Integer wrkNo;

    @ApiModelProperty("任务类型： agv, crn")
    @TableField("task_type")
    @TableId(value = "task_type")
    private String taskType;

    @ApiModelProperty("任务编码")