Signed-off-by: wangjinlong <450149261@qq.com>api继续中
Signed-off-by: wangjinlong <450149261@qq.com>
Merge branch 'HEAD' of https://github.com/ynpay/ynpay.git

Conflicts:
	ynpay-order-agent/src/main/java/net/tiangu/ynpay/order/agent/facade/bus/BusClassFacadeBean.java
	ynpay-order-agent/src/main/java/net/tiangu/ynpay/order/agent/helper/bus/eadd/EaddHelper.java

Signed-off-by: wangjinlong <450149261@qq.com>
Merge branch 'master' of https://github.com/ynpay/ynpay
Signed-off-by: wangjinlong <450149261@qq.com>
Signed-off-by: wangjinlong <450149261@qq.com>
Signed-off-by: wangjinlong <450149261@qq.com>
Merge branch 'master' of https://github.com/ynpay/ynpay

Conflicts:
	ynpay-order-agent/src/main/java/net/tiangu/ynpay/order/agent/helper/bus/eadd/EaddHelper.java

Signed-off-by: wangjinlong <450149261@qq.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	ynpay-order-agent/src/main/java/net/tiangu/ynpay/order/agent/helper/bus/eadd/EaddHelper.java
Signed-off-by: wangjinlong <450149261@qq.com>