Merge remote-tracking branch 'origin/devlop-phyz-spring3.5' into devlop-phy...

zhou zhou

21 小时以前 dad32aa4514963b724bf4c930212e61053fdd958

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

@@ -193,6 +193,12 @@
    @ApiModelProperty(value = "仓库名称")
    private String productionLineName;

    /**
     * 仓库名称
     */
    @ApiModelProperty(value = "仓库名称")
    private String stationTypeCode;

    public BasStation() {
    }