Merge branches 'develop' and 'feature/20200407_储值卡空指针修改_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # .gitignore # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml # order-application-service/src/main/resources/application-dev.properties # order-application-service/src/main/resources/application.properties
