- 18 Oct, 2021 1 commit
-
-
【华莱士】【订单C端记录不分账的卡面编号】不让走分账，卡面编号--11840，11845，11846，11853，11854，11855，11857，11858，11859，11860，11861，11862，11863，11864，11865，11866，11906 Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
- 15 Oct, 2021 4 commits
-
-
yuanyuan.jing committed
-
yuanyuan.jing committed
-
ping.wu committed
-
Merge branches 'feature/20210917_抖音买券_wp' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # 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-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
ping.wu committed
-
- 14 Oct, 2021 1 commit
-
-
yuanyuan.jing committed
-
- 13 Oct, 2021 2 commits
-
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
yuanyuan.jing committed
-
- 12 Oct, 2021 9 commits
-
-
周晓航 committed
-
ping.wu committed
-
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 -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
yuanyuan.jing committed
-
- 11 Oct, 2021 6 commits
-
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/dto/delivery/QueryDeliveryTemplateResponse.java # order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java
周晓航 committed -
Merge branches 'feature/20210916_积分商城扣积分流程调整_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
查志伟 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
- 09 Oct, 2021 5 commits
- 08 Oct, 2021 1 commit
-
-
Merge branches 'feature/20210917_订单数据为空判断修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed
-
- 28 Sep, 2021 2 commits
- 27 Sep, 2021 9 commits
