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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/AdminUpushServiceImpl.java

@@ -82,7 +82,7 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
             adminUpush.setPushedBy(authId);
             adminUpush.setPushedName(authName);
             if (adminUpush.getPushTime().isEmpty()) {
-                adminUpush.setPushTime(null);
+                adminUpush.setPushTime(DateUtil.getNowTime());
             }
             adminUpushMapper.insert(adminUpush);
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/basicServices/AdminUpushServiceImpl.java

@@ -63,8 +63,10 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
 
             if (!CollectionUtils.isEmpty(msgList)) {
                 for (AdminUpushVo info : msgList) {
-                    String img = imgUrl + info.getImg();
-                    info.setImg(img);
+                    if (!info.getImg().isEmpty()) {
+                        String img = imgUrl + info.getImg();
+                        info.setImg(img);
+                    }
                 }
             }