- 10 Sep, 2021 2 commits
- 09 Sep, 2021 1 commit
-
-
ping.wu committed
-
- 08 Sep, 2021 1 commit
-
-
ping.wu committed
-
- 07 Sep, 2021 4 commits
- 06 Sep, 2021 8 commits
- 03 Sep, 2021 1 commit
-
-
ping.wu committed
-
- 31 Aug, 2021 2 commits
- 27 Aug, 2021 1 commit
-
-
查志伟 committed
-
- 26 Aug, 2021 15 commits
-
-
胡博文 committed
-
胡博文 committed
-
胡博文 committed
-
周晓航 committed
-
Merge branches 'feature/order-complain-20210823' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/controller/OrderController.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
ping.wu committed -
Merge branches 'feature/order-complain-20210823' and 'pre' of http://gitlab.freemud.com/order-group-application/order-group into pre # Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/controller/OrderController.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
ping.wu committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
ping.wu committed
-
Merge branches 'master-20210826' and 'pre' of http://gitlab.freemud.com/order-group-application/order-group into pre # Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
ping.wu committed -
Merge branches 'feature/20210818_购物车新增积分商品_wuping' and 'master-20210826' of http://gitlab.freemud.com/order-group-application/order-group into master-20210826 # Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java # shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/CalculationDiscountBO.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountResponseDto.java # shopping-cart-application-service/src/main/java/cn/freemud/service/ShoppingCartNewService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java
ping.wu committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/enums/ShoppingCartPromotionEnum.java
查志伟 committed
-
- 25 Aug, 2021 3 commits
- 24 Aug, 2021 2 commits
