kira
|
cb39764a9f
|
Merge branch 'hotfix2' into develop
|
6 years ago |
|
kira
|
b8d2dcf8c6
|
update
|
6 years ago |
yixian
|
d8c907e75b
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yixian
|
b1e967695e
|
disable city partner
|
6 years ago |
|
kira
|
7cc6a73994
|
Merge branch 'hotfix_postpone' into develop
|
6 years ago |
|
kira
|
faa2fcd7f8
|
remove client postpone transaction
|
6 years ago |
|
kira
|
0e1ecd239d
|
Merge branch 'hotfix_custom' into develop
|
6 years ago |
|
kira
|
4143d12f7b
|
update
|
6 years ago |
|
kira
|
d5e292ce41
|
Merge branch 'hotfix_custom' into develop
|
6 years ago |
|
kira
|
3fb3c7b7e8
|
update
|
6 years ago |
|
kira
|
6ad7cf9342
|
Merge branch 'hotfix_custom'
|
6 years ago |
|
kira
|
683a7f8d98
|
Merge branch 'hotfix_custom' into develop
|
6 years ago |
|
kira
|
194e8e9e09
|
rollback
|
6 years ago |
|
kira
|
7db3b8875a
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
dd23152894
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
227fdeab34
|
Merge branch 'hotfix_custom' into develop
|
6 years ago |
|
kira
|
5e065b9e61
|
update
|
6 years ago |
taylor.dang
|
5fce139e12
|
fix 账单码查询时间
|
6 years ago |
eason
|
32c1221486
|
encourage config params add operator role permission
|
6 years ago |
|
eason
|
01d41922c2
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
7cae803907
|
Merge branch 'hotfix1' into develop
|
6 years ago |
|
eason
|
74afa68391
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
eason
|
8b33b85037
|
fix refund bug "input String"
|
6 years ago |
luoyang14z7
|
9fca669d45
|
fix : ali for excel
|
6 years ago |
|
luoyang14z7
|
90da2a1c1c
|
fix : ali for excel
|
6 years ago |
|
kira
|
f21b52a42f
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
f682caf7cb
|
update
|
6 years ago |
|
eason
|
010bd56a61
|
fix
|
6 years ago |
|
kira
|
8031e87fcf
|
Merge branch 'hotfix_custom' into develop
|
6 years ago |
|
kira
|
26eb3f8241
|
modify Custom
|
6 years ago |
|
taylor.dang
|
9b9b430dfa
|
修改翼支付清算开始日期
|
6 years ago |
|
kira
|
e51b6af17d
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
bf25295eab
|
update
|
6 years ago |
|
kira
|
560cb9a115
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
afc17eb0fa
|
add ctrip active
|
6 years ago |
|
kira
|
bbb6d23d36
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
d1cd353b53
|
updae
|
6 years ago |
|
kira
|
facbfecb82
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
c41d8ad453
|
update
|
6 years ago |
|
kira
|
da0e7c5c84
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
d1be4005f8
|
add ctrip active
|
6 years ago |
|
kira
|
17b3f99880
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java
|
6 years ago |
|
kira
|
5251d2fde3
|
fixbug
|
6 years ago |
|
kira
|
eb4ffa947d
|
update
|
6 years ago |
|
kira
|
b3d8318097
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
a328af2b7a
|
tmp
|
6 years ago |
|
kira
|
3ea9756383
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
yuan
|
2dd9347ab8
|
Merge branch '8/7' into develop
|
6 years ago |
|
yuan
|
1586860791
|
fix bug
|
6 years ago |
|
kira
|
2b017b6896
|
Merge branch 'hotfix' into develop
|
6 years ago |
