Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

19 小时以前 af5081bc0d0668d526a204076557a171097ddb8d

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

@@ -57,9 +57,9 @@
    private Long code;

    /**
     * 比码方向阈 1:  大于  0    小于
     * 比码方向阈
     */
    @ApiModelProperty(value= "比码方向阈 1:  大于  0    小于")
    @ApiModelProperty(value= "比码方向阈")
    private Integer compDirect;

    /**