Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

昨天 af5081bc0d0668d526a204076557a171097ddb8d

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java

@@ -65,6 +65,9 @@
    @ApiModelProperty(value= "作业角度")
    private String angle;

    @ApiModelProperty(value= "货叉方向")
    private Integer actDir;

    @ApiModelProperty(value= "连续入库等待(ms)")
    private Integer inboundWait;