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

panlinlin

2021-01-12 6e4a8cac04432f5a36d5c5e3c5eb3d28d2295a5c

 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java

@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.storager.dao;

import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;

@@ -42,7 +43,6 @@
                "#{online}" +
            ")")
    int add(Device device);


    @Update(value = {" <script>" +
                "UPDATE device " +