Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-15 cf8a22f50b81fa30abaa518bdce660cd65deabea

 src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java

@@ -94,6 +94,11 @@
     */
    private boolean status;

    /**
     * 在线状态
     */
    private int channelCount;


    public boolean isEnable() {
        return enable;
@@ -238,4 +243,12 @@
    public void setStatus(boolean status) {
        this.status = status;
    }

    public int getChannelCount() {
        return channelCount;
    }

    public void setChannelCount(int channelCount) {
        this.channelCount = channelCount;
    }
}