# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java # order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
Bugfix 门店未配置业务导致订单npe See merge request !144
购物车优化 codev4调用传递商品id See merge request !143
Merge branches 'feature/20220524_新商城_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
