Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

9 天以前 7c96576938ad64e30db51c597c6be3369dafe4b1

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java

@@ -49,6 +49,7 @@
    @ApiModelProperty(value= "主单ID")
    private Long locId;


    @ApiModelProperty("库位编码")
    private String locCode;