Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mrjackwang

2022-03-10 1cb2b2cc5f964573f56b54712ec023df6dcef843

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

@@ -74,7 +74,7 @@
                "<if test=\"keepaliveTime != null\">, keepaliveTime='${keepaliveTime}'</if>" +
                "<if test=\"expires != null\">, expires=${expires}</if>" +
                "<if test=\"charset != null\">, charset='${charset}'</if>" +
                "<if test=\"subscribeCycleForCatalog != null\">, subscribeCycleForCatalog=#{subscribeCycleForCatalog}</if>" +
                "<if test=\"subscribeCycleForCatalog != null\">, subscribeCycleForCatalog=${subscribeCycleForCatalog}</if>" +
                "WHERE deviceId='${deviceId}'"+
            " </script>"})
    int update(Device device);