Merge branch 'lc_0206_alertLog' into uat

suishenbang-admin/src/main/resources/templates/system/upvoteLog/upvoteLog.html

@@ -133,7 +133,7 @@
                     title : '弹框图片',
                     width : '100px',
                     formatter: function(value, row, index) {
-                        if (value != null&& value!=""){
+                        if (value != null&& value!="null"){
                             // return $.table.imageView(value,600,300,"tableImage_s img-view");
                             var valueStr = value + '';
                             console.log('url1',value);