Merge branches 'feature/20210330_log.info修改_wuping' and 'feature/20210507_合并打印日志分支_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20210507_合并打印日志分支_wuping # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/test/java/cn.freemud/client/MemberProductClientTest.java # order-application-service/src/test/java/cn.freemud/client/StockClientTest.java # order-application-service/src/test/java/cn.freemud/client/StoreClientTest.java # shopping-cart-application-service/src/main/java/cn/freemud/hystrix/MemberClientFallbackFactory.java # shopping-cart-application-service/src/main/java/cn/freemud/hystrix/ShortMessageClientFallbackFactory.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuriedPointServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/RecommendServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/StoreServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java # shopping-cart-application-service/src/test/java/cn.freemud/client/MemberProductClientTest.java # shopping-cart-application-service/src/test/java/cn.freemud/client/PaymentClientTest.java # shopping-cart-application-service/src/test/java/cn.freemud/client/ShoppingCartClientTest.java # shopping-cart-application-service/src/test/java/cn.freemud/client/StoreClientTest.java # shopping-cart-application-service/src/test/java/cn.freemud/client/WeChatClientTest.java # shopping-cart-application-service/src/test/java/cn.freemud/service/ShoppingCartNewServiceTest.java # shopping-cart-application-service/src/test/java/cn.freemud/service/UserServiceTest.java
