Supwisdom Source - epayment/food

author	kaixiang.xia <kaixiang.xia@supwisdom.com>
	Wed, 9 Sep 2020 01:55:42 +0000 (09:55 +0800)
committer	kaixiang.xia <kaixiang.xia@supwisdom.com>
	Wed, 9 Sep 2020 01:55:42 +0000 (09:55 +0800)
commit	5652a7b01bd8b0aa4530de1302e2ba0a0c789bb6
tree	5a7461faacd925c752e9c47ea95839a3aaa264e9	tree \| snapshot
parent	4c7ba45df0d4ea213c64a5eb2b1b0b6cf1334896	commit \| diff
parent	942557f02103550191eeac12953edf9e45f90f1c	commit \| diff

Merge tag '1.0.25' into develop

积分模块

点餐支付平台服务

payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java	diff1 \|	diff2 \|	blob \| history
payapi-sdk/src/test/java/com/supwisdom/dlpay/paysdktest/CitizenCardPayProxyTest.java	diff1 \|	diff2 \|	blob \| history
payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt	diff1 \|	diff2 \|	blob \| history
payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/transaction_service_impl.kt	diff1 \|	diff2 \|	blob \| history
payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/transaction_service.kt	diff1 \|	diff2 \|	blob \| history