kira
|
2f0816573f
|
Merge branch 'develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java
|
6 years ago |
luoyang
|
962fb6c192
|
fix rpay merchant Id displayname
|
6 years ago |
|
luoyang
|
7ba97fe686
|
fix properties +rpay
|
6 years ago |
taylor.dang
|
5880537788
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
taylor.dang
|
ea3ba4a5e0
|
fix
|
6 years ago |
|
kira
|
ce3e896e89
|
add rpay merchant
|
6 years ago |
|
kira
|
98332d95a5
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
# src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
# src/main/resources/application-rpay.properties
# src/main/ui/static/payment/partner/partner-manage.js
# src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
|
6 years ago |
|
kira
|
09755b167c
|
modify
|
6 years ago |
|
taylor.dang
|
ee0854002e
|
[Y] 商户地理位置定时任务
|
6 years ago |
|
taylor.dang
|
48c347a55a
|
[Y] 初始化商户地理位置信息
|
6 years ago |
|
taylor.dang
|
2ebe5a2eb7
|
[Y] 初始化商户地理位置信息
|
6 years ago |
|
kira
|
10a0a6f0ce
|
add rpay
|
6 years ago |
|
kira
|
43ab6507d6
|
tmp
|
6 years ago |
|
kira
|
4f73be6d88
|
Merge remote-tracking branch 'origin/develop_rpay' into develop_rpay
|
6 years ago |
|
kira
|
deebb88a2c
|
update
|
6 years ago |
|
taylor.dang
|
da29d53dc9
|
[Y] 新增恢复商户功能
|
6 years ago |
|
luoyang
|
4d1e4b3aa1
|
update revert partner
|
6 years ago |
|
luoyang
|
d6c4a5aafb
|
update modify.sql
|
6 years ago |
|
luoyang
|
1987cc09f8
|
update merchant
|
6 years ago |
|
kira
|
d416b2265f
|
tmp
|
6 years ago |
yixian
|
bef28c176e
|
settlement mail password source-dev version hotfix
|
6 years ago |
|
yixian
|
2a6cbe1b69
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
b70b34f55f
|
Merge branch 'hotfix-mailpassword' into develop
|
6 years ago |
|
yixian
|
25fbddacd9
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yixian
|
61dc277d62
|
settlement mail password source
|
6 years ago |
|
luoyang
|
8eb861edf3
|
update rpay html
|
6 years ago |
|
taylor.dang
|
137d1cf71e
|
[Y] 红包发送历史关联
|
6 years ago |
|
kira
|
dd6392c625
|
update
|
6 years ago |
|
kira
|
00775570b9
|
Merge remote-tracking branch 'origin/develop_rpay' into develop_rpay
|
6 years ago |
|
luoyang
|
7ec5f96087
|
rollback
|
6 years ago |
|
kira
|
ebf61c187f
|
add rpay
|
6 years ago |
hellolujian
|
aadf58d211
|
[fix]红包关联globalpay_openid
|
6 years ago |
|
yixian
|
c0ec8defea
|
ATO Report,
|
6 years ago |
|
taylor.dang
|
d23de1a885
|
fix
|
6 years ago |
|
taylor.dang
|
3e4085bbf4
|
mybatis 延迟加载启动
|
6 years ago |
|
taylor.dang
|
b72cba1a1d
|
mybatis 延迟加载启动
|
6 years ago |
|
kira
|
bb4d1f9209
|
Revert "add rpoy+"
This reverts commit 94aa36f657.
|
6 years ago |
|
kira
|
0f04e357e4
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
luoyang
|
175cfdd6a0
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
354985e242
|
rollback
|
6 years ago |
|
kira
|
1bf8b6cd22
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
a0e5de2690
|
update
|
6 years ago |
|
luoyang
|
94aa36f657
|
add rpoy+
|
6 years ago |
|
taylor.dang
|
aa584e4286
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
a7b53e63bf
|
fix bugs
|
6 years ago |
|
taylor.dang
|
12289ad472
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
aa409635e8
|
fix
|
6 years ago |
|
taylor.dang
|
9129c0d0a2
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
23249eea35
|
红包活动
|
6 years ago |
|
taylor.dang
|
de643f867a
|
Merge branch 'develop'
|
6 years ago |
