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

chen.lin

22 小时以前 79843611908e58f9538f8d8ebac62d3f0d01712c

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

@@ -84,7 +84,7 @@
    /**
     * 设备编号
     */
    @ApiModelProperty(value= "设备编号")
    @ApiModelProperty(value= "接驳位")
    private String deviceCode;

    /**