wangning
|
d37037f2ea
|
update
|
9 years ago |
|
wangning
|
88021a718c
|
add common sub_merchant_id
|
9 years ago |
eason.qian
|
121950e4a7
|
update app statement detail api
|
9 years ago |
yuan
|
91c8b1a398
|
add sql
|
9 years ago |
|
yuan
|
1ff7c46bc3
|
增加sub_merchant_id修改列表
|
9 years ago |
|
yuan
|
2e44dd4214
|
商户管理增加store_photo字段
|
9 years ago |
|
wangning
|
a74121cc62
|
Merge branch 'develop' into develop_client_config
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
|
9 years ago |
|
wangning
|
baec160c2d
|
Merge branch 'develop_postpone' into develop
|
9 years ago |
|
wangning
|
8c5b02fc92
|
client postpone
|
9 years ago |
|
yuan
|
f44036b04c
|
fix`
|
9 years ago |
|
yuan
|
8fc003f87e
|
fix`
|
9 years ago |
|
yuan
|
9a10445398
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 years ago |
|
yuan
|
d6de760fe0
|
fix bug
|
9 years ago |
|
eason.qian
|
df189f70ba
|
fix
|
9 years ago |
|
yuan
|
6c33158e66
|
fix bug
|
9 years ago |
|
yuan
|
cedbbfe97e
|
fix~
|
9 years ago |
|
yuan
|
ddb1ebd101
|
Merge branch 'settlement' into develop
|
9 years ago |
|
yuan
|
005418d1eb
|
fix~
|
9 years ago |
|
wangning
|
3dfbfc9647
|
update
|
9 years ago |
|
wangning
|
0d7d2ade26
|
update
|
9 years ago |
|
yuan
|
010586e3fd
|
add~
|
9 years ago |
|
yuan
|
071c05905a
|
fix~
|
9 years ago |
|
yuan
|
ae8ea53870
|
商户管理增加suburb筛选
|
9 years ago |
|
wangning
|
997867d224
|
update
|
9 years ago |
|
wangning
|
48e5624cb2
|
merge conflict
|
9 years ago |
|
wangning
|
eacb8d89de
|
update
|
9 years ago |
|
eason.qian
|
3f4a2cf9a6
|
fix partner invoice + settlement log tip
|
9 years ago |
|
wangning
|
f4345b7096
|
update
|
9 years ago |
|
wangning
|
2936b1072e
|
order bind qrcode version
|
9 years ago |
|
wangning
|
c221156029
|
add qrcode log
|
9 years ago |
|
wangning
|
2f1abf902a
|
add mongo
|
9 years ago |
|
eason.qian
|
470f5d191e
|
fix add app invoice
|
9 years ago |
|
wangning
|
518b0639b4
|
Merge branch 'update' into develop
|
9 years ago |
|
wangning
|
fce674a87b
|
update
|
9 years ago |
|
wangning
|
f41096d2a1
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
wangning
|
31ee2f686f
|
Merge branch 'update' into develop
|
9 years ago |
|
wangning
|
bf3d6db0d0
|
fix apidoc
|
9 years ago |
|
yuan
|
873ec92e6c
|
fix~
|
9 years ago |
|
yuan
|
e00d2bf155
|
fix ~
|
9 years ago |
yixian
|
40a0078132
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 years ago |
|
yixian
|
e2455be41c
|
ABA File Modify
|
9 years ago |
|
wangning
|
6931dcd1de
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
wangning
|
e0417057b5
|
copy switch surcharge interface
|
9 years ago |
|
yuan
|
1c8cb8714e
|
商户管理增加merchangt pay gst开关选项，fix bug
|
9 years ago |
|
yuan
|
ceafd8b858
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 years ago |
|
yuan
|
312193b298
|
商户端增加partner_invoice.html
|
9 years ago |
|
eason.qian
|
49a9a2a5c1
|
fix
|
9 years ago |
|
wangning
|
95e0d8c2cb
|
Merge branch 'update' into develop
|
9 years ago |
|
wangning
|
0bc5ec040e
|
update
|
9 years ago |
|
wangning
|
39185f20d9
|
update
|
9 years ago |
