-
Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'qa' of… · 94bcfca1
Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
ping.wu committed