Merge tag '1.0.27' into develop
authorkaixiang.xia <kaixiang.xia@supwisdom.com>
Mon, 26 Oct 2020 07:38:34 +0000 (15:38 +0800)
committerkaixiang.xia <kaixiang.xia@supwisdom.com>
Mon, 26 Oct 2020 07:38:34 +0000 (15:38 +0800)
commit7c782d00e01cd80fc852d25c07a53f2cef347e98
treec2dedb9ddfe56dc05f59c6f481d25f895cd4b227
parent1989ab49f573c626cb67623d918145e4287e5f50
parent9416972def4007e87b35c7b1f5bd2b5ddb08c4b2
Merge tag '1.0.27' into develop

市民卡信息新增公交卡字段
payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java
payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt
payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt
payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt