kira
|
fb4c1440cc
|
Merge branch 'develop'
# Conflicts:
# src/main/ui/static/payment/partner/templates/client_payment_info.html
|
6 years ago |
|
kira
|
2af6fcf302
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
luoyang
|
000a66a10b
|
fix clickcopy
|
6 years ago |
|
luoyang
|
6081636870
|
add hf_test show 3
|
6 years ago |
yangkai
|
5c6125c14a
|
bd开放修改Short Name、Business Name权限
|
6 years ago |
|
luoyang
|
5166240edf
|
add clearing_estimate : hf
|
6 years ago |
taylor.dang
|
f86436dc74
|
pom
|
6 years ago |
|
taylor.dang
|
fffec0aabd
|
[y]修复禁用商户提醒 & 黑名单商户查询
|
6 years ago |
|
taylor.dang
|
348bcdf8dc
|
[y]修复禁用商户提醒 & 黑名单商户查询
|
6 years ago |
yixian
|
2b6f6b88e1
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
8321cfb724
|
ATO Report,
order channel support
|
6 years ago |
|
luoyang
|
b1946bc759
|
fix partnerInfo
|
6 years ago |
|
luoyang
|
233aeca919
|
fix partnerInfo - copy icon
|
6 years ago |
|
luoyang
|
76191adfa6
|
Merge branch 'develop'
|
6 years ago |
|
luoyang
|
384475da74
|
add partnerInfo - copy icon
|
6 years ago |
|
kira
|
8e65c89875
|
maven
|
6 years ago |
|
kira
|
207bb0f980
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
be2cebfd71
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
c7c63d577f
|
Merge branch 'hotfix'
|
6 years ago |
|
kira
|
7dedb7aaf5
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
24b286198c
|
update
|
6 years ago |
|
taylor.dang
|
d680b16875
|
log
|
6 years ago |
|
taylor.dang
|
01d5c6129d
|
log
|
6 years ago |
|
kira
|
9273c0fa4f
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
6c88a7ce0a
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
b4f595c34c
|
add settle mail
|
6 years ago |
|
luoyang
|
0679f626ce
|
fix clearing
|
6 years ago |
|
luoyang
|
35c5ac5155
|
fix clearing
|
6 years ago |
|
kira
|
4a36fa5cc0
|
maven
|
6 years ago |
|
luoyang
|
0670a41ee9
|
fix clearing
|
6 years ago |
|
kira
|
dd2d72e177
|
update hf industry
|
6 years ago |
|
kira
|
de4aee60ed
|
update hf industry
|
6 years ago |
|
kira
|
7a0bfcab9a
|
test HF
|
6 years ago |
|
kira
|
60586c9d4d
|
fixbug parent client invalid
|
6 years ago |
|
luoyang
|
b10b343679
|
fix clearing
|
6 years ago |
|
taylor.dang
|
c6f214559d
|
支付宝进件信息
|
6 years ago |
|
kira
|
e2b9855082
|
add css
|
6 years ago |
|
kira
|
5e4b451ceb
|
Merge branch 'develop'
|
6 years ago |
|
kira
|
26d0cc2cde
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
9e6affb143
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
fc22178c03
|
邮件模板添加货币类型
|
6 years ago |
|
luoyang
|
6d8e22c8ca
|
fix hf
|
6 years ago |
|
luoyang
|
e4a92a209b
|
fix hf
|
6 years ago |
|
luoyang
|
ca9dca7abc
|
fix hf
|
6 years ago |
|
luoyang
|
f14c1bda2e
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
71eeb42bb2
|
fix hf
|
6 years ago |
|
kira
|
555561291e
|
update
|
6 years ago |
|
yangkai
|
400a1cb38d
|
update
|
6 years ago |
|
yangkai
|
cc6d0ed83d
|
携程优惠券记录筛选
|
6 years ago |
|
kira
|
6a8bc02f9e
|
Merge branch 'develop'
|
6 years ago |
