wangning
|
e58f04d4b2
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
5f4a59ecde
|
hotfix
|
7 years ago |
eason.qian
|
6bf0c95e29
|
fix
|
7 years ago |
|
wangning
|
39f1cf3b4d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
0fbc13988a
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
c531ce911a
|
update
|
7 years ago |
yuan
|
3d7bddfc92
|
modify html
|
7 years ago |
|
yuan
|
75bdedc6f9
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
df901c8745
|
fix bug
|
7 years ago |
|
wangning
|
3b103e0568
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
abf23053d7
|
fixbug
|
7 years ago |
yixian
|
be462ec53d
|
Merge branch 'hotfix20180322manualsettle' into develop
|
7 years ago |
|
yixian
|
c846ce2451
|
Merge branch 'hotfix20180322manualsettle'
|
7 years ago |
|
yixian
|
5db4a09b92
|
manual settle
|
7 years ago |
|
wangning
|
0997bf3cb0
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
26e7eee4af
|
update aggregate QR board template
|
7 years ago |
|
eason.qian
|
f0ade8c924
|
fix
|
7 years ago |
|
eason.qian
|
8ccbbe6e61
|
fix
|
7 years ago |
|
yuan
|
8f363f5c07
|
增加查看mondelay活动记录表
|
7 years ago |
|
wangning
|
332a2e6884
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
eason.qian
|
df4c8f90d0
|
fix
|
7 years ago |
|
wangning
|
f26f218a18
|
Merge branch 'notice' into develop
|
7 years ago |
|
wangning
|
69708125bf
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
0ec7bc27c0
|
update
|
7 years ago |
|
eason.qian
|
187298aad8
|
fix
|
7 years ago |
|
wangning
|
1d0100a4c9
|
update
|
7 years ago |
|
wangning
|
d84064a62b
|
fixbug tax_amount
|
7 years ago |
|
wangning
|
a40c046e41
|
fixbug
|
7 years ago |
|
wangning
|
9e42de04bb
|
Merge branch 'develop'
|
7 years ago |
|
wangning
|
bda4f507ac
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e4018d4939
|
update manual settle
|
7 years ago |
|
yixian
|
306d7d475d
|
Merge branch 'hotfix20180322manualsettle'
|
7 years ago |
|
yixian
|
8a161c904f
|
Merge branch 'hotfix20180322manualsettle' into develop
|
7 years ago |
|
yixian
|
167c977fd8
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
3388f19b31
|
manual settle
|
7 years ago |
|
yuan
|
7850e9e36c
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
ed6aa9c00c
|
fix bug
|
7 years ago |
|
wangning
|
ce1da924fd
|
update
|
7 years ago |
|
yuan
|
6704da48b9
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
f3ad56587f
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/resources/templates/activity/mondelay/mondelay.html
|
7 years ago |
|
wangning
|
ab6c1dc34b
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
7cd32650b6
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java
|
7 years ago |
|
wangning
|
ba5174fda7
|
update
|
7 years ago |
|
wangning
|
24510cf6e6
|
tmp
|
7 years ago |
|
yuan
|
e9308e0fc5
|
modify html
|
7 years ago |
|
eason.qian
|
1efd1b604a
|
fix
|
7 years ago |
|
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 |
