wangning
|
a40c046e41
|
fixbug
|
8 years ago |
|
wangning
|
9e42de04bb
|
Merge branch 'develop'
|
8 years ago |
|
wangning
|
bda4f507ac
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
8 years ago |
|
wangning
|
e4018d4939
|
update manual settle
|
8 years ago |
yixian
|
306d7d475d
|
Merge branch 'hotfix20180322manualsettle'
|
8 years ago |
|
yixian
|
8a161c904f
|
Merge branch 'hotfix20180322manualsettle' into develop
|
8 years ago |
|
yixian
|
167c977fd8
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
yixian
|
3388f19b31
|
manual settle
|
8 years ago |
yuan
|
7850e9e36c
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
yuan
|
ed6aa9c00c
|
fix bug
|
8 years ago |
|
wangning
|
ce1da924fd
|
update
|
8 years ago |
|
yuan
|
6704da48b9
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
yuan
|
f3ad56587f
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/resources/templates/activity/mondelay/mondelay.html
|
8 years ago |
|
wangning
|
ab6c1dc34b
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
8 years ago |
|
wangning
|
7cd32650b6
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java
|
8 years ago |
|
wangning
|
ba5174fda7
|
update
|
8 years ago |
|
wangning
|
24510cf6e6
|
tmp
|
8 years ago |
|
yuan
|
e9308e0fc5
|
modify html
|
8 years ago |
eason.qian
|
1efd1b604a
|
fix
|
8 years ago |
|
yuan
|
9c06de37d9
|
Merge branch 'hotfix' into develop
|
8 years ago |
|
yuan
|
3545b72406
|
add cancle_waring msg
|
8 years ago |
|
yuan
|
7cb99fbc0c
|
fix bug
|
8 years ago |
|
yuan
|
7a7f7c2319
|
modify html
|
8 years ago |
|
eason.qian
|
92646432d5
|
fix
|
8 years ago |
|
yixian
|
3838e9d955
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
yixian
|
34bb4da9ee
|
Merge branch 'hotfix20180322manualsettle'
|
8 years ago |
|
yixian
|
0e826d98d2
|
rule update
|
8 years ago |
|
yixian
|
211da4f69e
|
rule update
|
8 years ago |
|
yixian
|
d47830f7f9
|
find settle to
|
8 years ago |
|
eason.qian
|
d2ee955ca8
|
fix
|
8 years ago |
|
eason.qian
|
777a8c314e
|
Merge remote-tracking branch 'origin/master'
|
8 years ago |
|
eason.qian
|
34605db062
|
fix
|
8 years ago |
|
wangning
|
55c7a93439
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
8 years ago |
|
wangning
|
beefaeccc0
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
8 years ago |
|
wangning
|
7afbb7479f
|
fixbug
|
8 years ago |
|
eason.qian
|
44805b5c31
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
eason.qian
|
2287468292
|
fix
|
8 years ago |
|
wangning
|
e5a6813c91
|
update
|
8 years ago |
|
wangning
|
8698d78681
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
8 years ago |
|
wangning
|
daee2f1a2e
|
update QR board
|
8 years ago |
|
yuan
|
3714c814c3
|
modify html
|
8 years ago |
|
wangning
|
cd60d89c40
|
unread interface add column msg_interval
|
8 years ago |
|
wangning
|
30d1c708f8
|
Partner Settlements Logs
|
8 years ago |
|
wangning
|
35c97f7182
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
8 years ago |
|
wangning
|
7e35483150
|
update
|
8 years ago |
|
eason.qian
|
58f69e64f3
|
Merge branch 'develop'
|
8 years ago |
|
eason.qian
|
d5097ff363
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
eason.qian
|
0667724269
|
mu
|
8 years ago |
|
yuan
|
61152808b4
|
商户端增加提现功能
|
8 years ago |
|
wangning
|
e88681bbca
|
Merge branch 'develop'
|
8 years ago |
