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

zhou zhou

昨天 10776dd6f7f9ef9e47419427fcb1b692ed73d54d

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

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

    /**