Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/resources/application.properties

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

@@ -1635,12 +1635,14 @@ public class ShoppingCartMCoffeeServiceImpl {
                     if(i != size-1) {
                         allCartGoodsList.remove(i);
                         allCartGoodsList.add(cartGoods);
-                        i--;
+                        break;
                     }
                 }
             }
         }
 
+        log.info(JSON.toJSONString(allCartGoodsList));
+
         return allCartGoodsList;
     }
 

shopping-cart-application-service/src/main/resources/application.properties

@@ -21,5 +21,4 @@ management.endpoints.web.exposure.include=prometheus,info,health,shutdown
 management.metrics.tags.application=${spring.application.name}
 management.endpoint.shutdown.enabled=true
 management.security.enabled=false
-management.health.rabbit.enabled=false
-
+management.health.rabbit.enabled=false
\ No newline at end of file