yuan
|
9c06de37d9
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
yuan
|
3545b72406
|
add cancle_waring msg
|
7 years ago |
|
yuan
|
7cb99fbc0c
|
fix bug
|
7 years ago |
|
yuan
|
7a7f7c2319
|
modify html
|
7 years ago |
eason.qian
|
92646432d5
|
fix
|
7 years ago |
yixian
|
3838e9d955
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
34bb4da9ee
|
Merge branch 'hotfix20180322manualsettle'
|
7 years ago |
|
yixian
|
0e826d98d2
|
rule update
|
7 years ago |
|
yixian
|
211da4f69e
|
rule update
|
7 years ago |
|
yixian
|
d47830f7f9
|
find settle to
|
7 years ago |
|
eason.qian
|
d2ee955ca8
|
fix
|
7 years ago |
|
eason.qian
|
777a8c314e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
34605db062
|
fix
|
7 years ago |
wangning
|
55c7a93439
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
beefaeccc0
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7afbb7479f
|
fixbug
|
7 years ago |
|
eason.qian
|
44805b5c31
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
2287468292
|
fix
|
7 years ago |
|
wangning
|
e5a6813c91
|
update
|
7 years ago |
|
wangning
|
8698d78681
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
daee2f1a2e
|
update QR board
|
7 years ago |
|
yuan
|
3714c814c3
|
modify html
|
7 years ago |
|
wangning
|
cd60d89c40
|
unread interface add column msg_interval
|
7 years ago |
|
wangning
|
30d1c708f8
|
Partner Settlements Logs
|
7 years ago |
|
wangning
|
35c97f7182
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7e35483150
|
update
|
7 years ago |
|
eason.qian
|
58f69e64f3
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
d5097ff363
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
0667724269
|
mu
|
7 years ago |
|
yuan
|
61152808b4
|
商户端增加提现功能
|
7 years ago |
|
wangning
|
e88681bbca
|
Merge branch 'develop'
|
7 years ago |
|
yuan
|
8f14cb47a2
|
update
|
7 years ago |
|
yixian
|
c011802240
|
scale
|
7 years ago |
|
yixian
|
ba6e50ab5c
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java
|
7 years ago |
|
yixian
|
041746ef4e
|
scale
|
7 years ago |
|
eason.qian
|
3cbdaf0339
|
fix cache bug~
|
7 years ago |
|
wangning
|
558c9fd771
|
update
|
7 years ago |
|
wangning
|
a5608059ea
|
update
|
7 years ago |
|
wangning
|
0fea884bd1
|
update
|
7 years ago |
|
wangning
|
d41232822f
|
update
|
7 years ago |
|
wangning
|
f6d92dde3a
|
update
|
7 years ago |
|
wangning
|
9bd674275f
|
update
|
7 years ago |
|
wangning
|
f14dbf84ae
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
eason.qian
|
91bba5dea4
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
10bb3b1404
|
fix
|
7 years ago |
|
wangning
|
111073ba77
|
Merge branch 'master_contract_analysis' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/manage.html
|
7 years ago |
|
wangning
|
69104c110c
|
update
|
7 years ago |
|
wangning
|
674235960d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
bf8b17a5dc
|
Merge branch 'master_rate_cache' into develop
|
7 years ago |
|
wangning
|
27c5d25eb6
|
delete manager manual_settle
|
7 years ago |
