yuan
|
071c05905a
|
fix~
|
7 years ago |
|
yuan
|
ae8ea53870
|
商户管理增加suburb筛选
|
7 years ago |
wangning
|
997867d224
|
update
|
7 years ago |
|
wangning
|
48e5624cb2
|
merge conflict
|
7 years ago |
|
wangning
|
eacb8d89de
|
update
|
7 years ago |
eason.qian
|
3f4a2cf9a6
|
fix partner invoice + settlement log tip
|
7 years ago |
|
wangning
|
f4345b7096
|
update
|
7 years ago |
|
wangning
|
2936b1072e
|
order bind qrcode version
|
7 years ago |
|
wangning
|
c221156029
|
add qrcode log
|
7 years ago |
|
wangning
|
2f1abf902a
|
add mongo
|
7 years ago |
|
eason.qian
|
470f5d191e
|
fix add app invoice
|
7 years ago |
|
wangning
|
518b0639b4
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
fce674a87b
|
update
|
7 years ago |
|
wangning
|
f41096d2a1
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
31ee2f686f
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
bf3d6db0d0
|
fix apidoc
|
7 years ago |
|
yuan
|
873ec92e6c
|
fix~
|
7 years ago |
|
yuan
|
e00d2bf155
|
fix ~
|
7 years ago |
yixian
|
40a0078132
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
e2455be41c
|
ABA File Modify
|
7 years ago |
|
wangning
|
6931dcd1de
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e0417057b5
|
copy switch surcharge interface
|
7 years ago |
|
yuan
|
1c8cb8714e
|
商户管理增加merchangt pay gst开关选项，fix bug
|
7 years ago |
|
yuan
|
ceafd8b858
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
312193b298
|
商户端增加partner_invoice.html
|
7 years ago |
|
eason.qian
|
49a9a2a5c1
|
fix
|
7 years ago |
|
wangning
|
95e0d8c2cb
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
0bc5ec040e
|
update
|
7 years ago |
|
wangning
|
39185f20d9
|
update
|
7 years ago |
|
wangning
|
c39bee44e6
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
264ec82506
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
492a4f3f06
|
Merge branch 'bugfix' into develop
|
7 years ago |
|
wangning
|
2ba62a83f1
|
bug fix
|
7 years ago |
|
wangning
|
e7f2bfb302
|
add app client QRcode
|
7 years ago |
|
eason.qian
|
2707c2b195
|
fix
|
7 years ago |
|
wangning
|
9f428e2bd8
|
update
|
7 years ago |
|
eason.qian
|
8f7125dae6
|
Merge branch 'develop'
|
7 years ago |
|
yuan
|
c72612110d
|
fix html
|
7 years ago |
|
yuan
|
580ea4ee05
|
商户管理增加merchant_id筛选
|
7 years ago |
|
eason.qian
|
e2b3d6c686
|
fix 最后一步打回
|
7 years ago |
|
wangning
|
05d325db47
|
Merge branch 'develop' into develop_client_config
# Conflicts:
# src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
|
7 years ago |
|
wangning
|
3ce990059b
|
update
|
7 years ago |
|
wangning
|
318c661057
|
Merge branch 'develop' into develop_client_config
|
7 years ago |
|
eason.qian
|
77738cf8a5
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
7f40f73ad6
|
fix
|
7 years ago |
|
wangning
|
4920ab324b
|
update
|
7 years ago |
|
wangning
|
ad08428964
|
update
|
7 years ago |
|
wangning
|
498b30c519
|
update
|
7 years ago |
|
eason.qian
|
2b928e930d
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
210408268e
|
fix
|
7 years ago |
