Merge branch 'bugfix-购物车NPE' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -2819,7 +2819,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      * @param cartUid
      */
     public void clearMsg(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, String cartUid) {
-        if (StringUtils.isNotBlank(shoppingCartGoodsResponseVo.getToastMsg()) && StringUtils.isNotBlank(shoppingCartGoodsResponseVo.getUid()) && !cartUid.equals(shoppingCartGoodsResponseVo.getUid())) {
+        if (StringUtils.isNotBlank(shoppingCartGoodsResponseVo.getToastMsg()) && StringUtils.isNotBlank(shoppingCartGoodsResponseVo.getUid()) && !Objects.equals(cartUid,shoppingCartGoodsResponseVo.getUid())) {
             shoppingCartGoodsResponseVo.setUid("");
             shoppingCartGoodsResponseVo.setToastMsg("");
         }