- 23 Jun, 2020 5 commits
-
-
chongfu.liang committed
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20200619_停车场订单sdk_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
chongfu.liang committed
-
- 22 Jun, 2020 13 commits
-
-
Merge branches 'develop' and 'feature/20200619_停车场订单sdk_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
ping.wu committed -
ping.wu committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
Merge branches 'develop' and 'feature/20200611_未在营业时间预约单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
xiaoer.li@freemud.com committed
-
Merge branches 'develop' and 'feature/20200619_停车场订单sdk_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
ping.wu committed -
ping.wu committed
-
- 19 Jun, 2020 3 commits
-
-
Merge branches 'develop' and 'feature/20200611_未在营业时间预约单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
ping.wu committed -
ping.wu committed
-
Merge remote-tracking branches 'remotes/origin/bugfix_套餐折扣' and 'remotes/origin/fix_集点不参与积分同享' into develop
xiaoer.li@freemud.com committed
-
- 18 Jun, 2020 4 commits
-
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
xiaoer.li@freemud.com committed -
xiaoer.li@freemud.com committed
-
- 17 Jun, 2020 9 commits
-
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
xiaoer.li@freemud.com committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
xiaoer.li@freemud.com committed -
xiaoer.li@freemud.com committed
-
Merge branches 'develop' and 'feature/20200611_未在营业时间预约单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
chongfu.liang committed
-
- 16 Jun, 2020 6 commits
-
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20200611_未在营业时间预约单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
ping.wu committed -
ping.wu committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
