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

zhang

6 天以前 16a09540001bd00f01b848f0ca125d16bf314450

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

@@ -105,6 +105,10 @@
    @TableLogic
    private Integer deleted;

    @ApiModelProperty(value= "巷道")
    private Integer channel;


    /**
     * 租户
     */