-
Merge branches 'develop' and 'feature/20200720_预约单取餐时间字段格式兼容_wuping' of… · cb88c29d
Merge branches 'develop' and 'feature/20200720_预约单取餐时间字段格式兼容_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # order-application-service/pom.xml # ordercenter-sdk/readme.md # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
ping.wu committed
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| java/cn/freemud | Loading commit data... | |
| resources | Loading commit data... |