kira
|
1a73f48808
|
重构
|
8 years ago |
eason
|
3e082165ff
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
eason
|
abb86b3c3a
|
Merge branch 'h1' into develop
|
8 years ago |
|
eason
|
4f46380949
|
fix excel remark
|
8 years ago |
|
kira
|
5c19193c78
|
fixbug
|
8 years ago |
|
kira
|
016f5f94b1
|
update
|
8 years ago |
yixian
|
b7736f3318
|
split bank in download xlsx
|
8 years ago |
|
kira
|
4948539479
|
tmp
|
8 years ago |
|
kira
|
47549c0a9d
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
8 years ago |
|
kira
|
8b688159f6
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
8 years ago |
|
kira
|
7589d920a8
|
Merge branch 'hotfix' into develop
|
8 years ago |
|
kira
|
ef4752ef1a
|
remove Tommy mail adddress
|
8 years ago |
|
kira
|
cc623b1a21
|
update
|
8 years ago |
|
yixian
|
dd66355486
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
yixian
|
36ec9d4b6b
|
Merge remote-tracking branch 'origin/master'
|
8 years ago |
|
yixian
|
6325331f62
|
Merge branch 'hotfix_multibank' into develop
|
8 years ago |
|
yixian
|
de1c415a2d
|
split bank in download xlsx
|
8 years ago |
|
kira
|
64fea0ebfe
|
update
|
8 years ago |
|
kira
|
2456a8a6bb
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
8 years ago |
|
kira
|
0200731725
|
add test
|
8 years ago |
|
kira
|
8d3c0d5987
|
add timer task
|
8 years ago |
|
kira
|
de7b91a0eb
|
add wx msg
|
8 years ago |
yuan
|
f60eb253a6
|
Merge branch '7/23' into develop
|
8 years ago |
|
yuan
|
8e13ac7452
|
fix html
|
8 years ago |
|
yuan
|
2d3d56bbb1
|
Merge branch '7/23' into develop
|
8 years ago |
|
yuan
|
12a510e30e
|
fix html
|
8 years ago |
|
kira
|
791ec028fe
|
udpate
|
8 years ago |
|
kira
|
bd7459810a
|
update
|
8 years ago |
|
kira
|
35ff5437c0
|
update
|
8 years ago |
|
kira
|
a0e0827bc4
|
update
|
8 years ago |
|
kira
|
89d1d26a4a
|
update
|
8 years ago |
|
kira
|
e472c81f5e
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
8 years ago |
|
kira
|
1bab9c4423
|
add openim application
|
8 years ago |
|
eason
|
27f5898810
|
Merge branch 'hotfix11' into develop
|
8 years ago |
|
eason
|
1050937afc
|
fix hf channel show
|
8 years ago |
|
eason
|
8ce50ccc36
|
Merge branch 'fix1' into develop
|
8 years ago |
|
eason
|
76f0cec66d
|
fix transaction
|
8 years ago |
|
kira
|
fde8a601ea
|
add customer servant config
|
8 years ago |
|
kira
|
c658495834
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
8 years ago |
|
kira
|
92a9e2a1ca
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java
|
8 years ago |
|
kira
|
a3bf49708c
|
fixbug encourage money
|
8 years ago |
|
kira
|
cc766351ad
|
add customer service
|
8 years ago |
|
eason
|
f7c0f165cd
|
fix encourage css
|
8 years ago |
|
eason
|
9999f0de43
|
fix 自定义商户费率
|
8 years ago |
|
kira
|
405fdda8d2
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
8 years ago |
|
kira
|
9e0ec85b81
|
Merge branch 'refundList' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
|
8 years ago |
|
kira
|
43abd4d5b1
|
add pos refund list
|
8 years ago |
|
kira
|
d0df62162f
|
customer tmp
|
8 years ago |
|
eason
|
29cf97ad89
|
fix encourage
|
8 years ago |
|
kira
|
8579b406d3
|
update
|
8 years ago |
